summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlzhang2012-06-04 01:06:06 (EDT)
committer mwu2012-06-04 01:06:06 (EDT)
commit7b3d576287461387cc7e42538c1900a67fe90f8d (patch)
tree8fb19a7615d5525712782a0f15b259b650c4eb10
parentf1038f0d76e572fe5a6ff5fc57658925576c22e8 (diff)
downloadorg.eclipse.birt-7b3d576287461387cc7e42538c1900a67fe90f8d.zip
org.eclipse.birt-7b3d576287461387cc7e42538c1900a67fe90f8d.tar.gz
org.eclipse.birt-7b3d576287461387cc7e42538c1900a67fe90f8d.tar.bz2
switch "recalculate totals", but result is same [50383]
-rw-r--r--data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java
index c4773c1..6b06577 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java
@@ -167,8 +167,15 @@ public class CubeQueryDefinitionUtil
if (isEqual((IFilterDefinition) newFilters.get(i),
(IFilterDefinition) baseFilters.get(j)))
{
- find = true;
- break;
+ if ( ( (IFilterDefinition) newFilters.get( i ) ).updateAggregation( ) == ( (IFilterDefinition) baseFilters.get( j ) ).updateAggregation( ) )
+ {
+ find = true;
+ break;
+ }
+ else
+ {
+ return null;
+ }
}
}
if( !find )
@@ -225,10 +232,6 @@ public class CubeQueryDefinitionUtil
{
return false;
}
- if ( fd1.updateAggregation( ) != fd2.updateAggregation( ) )
- {
- return false;
- }
if ( fd1 instanceof ICubeSortDefinition )
{
ICubeFilterDefinition cfd1 = (ICubeFilterDefinition)fd1;