MONDRIAN: Fixed Null pointer issue, bug id:1735821

[git-p4: depot-paths = "//open/mondrian/": change = 9455]
pentaho · Jun 12, 2007 · 3fb515a · 3fb515a
1 parent 30effb6
commit 3fb515a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/mondrian/olap/fun/TupleFunDef.java b/src/main/mondrian/olap/fun/TupleFunDef.java
@@ -91,7 +91,7 @@ private void checkDimensions(MemberType[] memberTypes) {
                 MemberType member1 = memberTypes[j];
                 final Dimension dimension = memberType.getDimension();
                 final Dimension dimension1 = member1.getDimension();
-                if (dimension == dimension1) {
+                if (dimension != null && dimension == dimension1) {
                     throw MondrianResource.instance().DupDimensionsInTuple.ex(
                             dimension.getUniqueName());
                 }

diff --git a/src/main/mondrian/olap/type/TupleType.java b/src/main/mondrian/olap/type/TupleType.java
@@ -54,7 +54,8 @@ public Type getValueType() {
         for (Type elementType : elementTypes) {
             if (elementType instanceof MemberType) {
                 MemberType memberType = (MemberType) elementType;
-                if (memberType.getDimension().isMeasures()) {
+                Dimension dimension = memberType.getDimension();
+                if (dimension != null && dimension.isMeasures()) {
                     return memberType.getValueType();
                 }
             }

diff --git a/testsrc/main/mondrian/olap/fun/FunctionTest.java b/testsrc/main/mondrian/olap/fun/FunctionTest.java
@@ -3640,6 +3640,10 @@ public void testItemNull()
         assertExprReturns(
                 "Filter([Gender].members, 1 = 0).Item(0).Parent",
                 "");
+        assertExprReturns(
+                "(Filter([Store].members, 0 = 0).Item(0).Item(0)," +
+                        "Filter([Store].members, 0 = 0).Item(0).Item(0))",
+                "266,773");
     }
 
     public void testTupleNull() {