summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpshi2012-03-12 04:30:10 (EDT)
committer mwu2012-03-12 04:30:10 (EDT)
commitf4638803919926e19b465ae0654dcab0a67a8fda (patch)
tree3714bcf6c5d73508c56a6a4ea0808b00a3c85656
parent6eee63ef8f0b6880642829ffb9fdbde13589b9c9 (diff)
downloadorg.eclipse.birt-f4638803919926e19b465ae0654dcab0a67a8fda.zip
org.eclipse.birt-f4638803919926e19b465ae0654dcab0a67a8fda.tar.gz
org.eclipse.birt-f4638803919926e19b465ae0654dcab0a67a8fda.tar.bz2
Summary:
Fix TED issue 47987: Exception is thrown out when the content of a mode aggregation with its value list of String type. Description of Issue: The exception cannot be added to the invalid msg, for the ending level is always bigger than the group level if the aggregation is on all. Description of Resolution: If the group level=0, also add the exception to the invalid msg TED(s) Resolved: 47987 Regression ( Yes/No ): Yes Code Owner Team: DTE Code Reviewers: mingxia wu Project ID: 1619 Test Description: Manual Test
-rw-r--r--data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/aggregation/AggregationHelper.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/aggregation/AggregationHelper.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/aggregation/AggregationHelper.java
index 3c65f5f..8e94dda 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/aggregation/AggregationHelper.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/executor/aggregation/AggregationHelper.java
@@ -207,8 +207,9 @@ public class AggregationHelper implements IAggrValueHolder
{
assert invalidAggrMsg != null;
- if ( getAggrInfo( index ).getAggregation( ).getType( ) == IAggrFunction .RUNNING_AGGR
- || endingGroupLevel <= getAggrInfo( index ).getGroupLevel( ) )
+ if ( getAggrInfo( index ).getAggregation( ).getType( ) == IAggrFunction.RUNNING_AGGR
+ || endingGroupLevel <= getAggrInfo( index ).getGroupLevel( )
+ || getAggrInfo( index ).getGroupLevel( ) == 0 )
currentRoundAggrValue[index].add( invalidAggrMsg.get( Integer.valueOf( index ) ) );
}