MONDRIAN: fixed NullPointerException in HighCardinality code when axi…

…s returned an empty result. [git-p4: depot-paths = "//open/mondrian/": change = 12152]
pentaho · Dec 22, 2008 · d107217 · d107217
1 parent 8dd1f74
commit d107217
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/mondrian/rolap/Target.java b/src/main/mondrian/rolap/Target.java
@@ -222,8 +222,8 @@ public RolapMember get(final int idx) {
                 }
 
                 if (idx == 0) {
-                    this.firstMemberAssigned = true;
                     this.first = list.get(index);
+                    this.firstMemberAssigned = true;
                     return this.first;
                 } else {
                     return list.get(index);

diff --git a/testsrc/main/mondrian/rolap/NonEmptyTest.java b/testsrc/main/mondrian/rolap/NonEmptyTest.java
@@ -3404,6 +3404,20 @@ public void testNonEmptyLevelMembers() {
         }
     }
 
+    public void testNonEmptyResults() {
+        // This unit test was failing with a NullPointerException in JPivot
+        // after the highcardinality feature was added, I've included it
+        // here to make sure it continues to work.
+        assertQueryReturns(
+                "select NON EMPTY {[Measures].[Unit Sales], [Measures].[Store Cost]} ON columns, "
+                + "NON EMPTY Filter([Product].[Brand Name].Members, ([Measures].[Unit Sales] > 100000.0)) ON rows "
+                + "from [Sales] where [Time].[1997]",
+                fold("Axis #0:\n" +
+                "{[Time].[1997]}\n" +
+                "Axis #1:\n" +
+                "Axis #2:\n"));
+    }
+
     /**
      * Make sure the mdx runs correctly and not in native mode.
      *