MONDRIAN

       The evaluateCurrent method should not return Util.nullValue but
       rather "null" since other code depends upon a "null" being
       returned (such as the CrossJoinFunDef class' nonEmptyList method).
       This could be changed so that it returns Util.nullValue rather
       than "null" (or either) but that requires changes to other classes.

[git-p4: depot-paths = "//open/mondrian/": change = 7628]

src/main/mondrian/rolap/RolapEvaluator.java

@@ -328,7 +328,11 @@ public Object evaluateCurrent() {
         evaluator.setExpanding(maxSolveMember);
         final Exp exp = maxSolveMember.getExpression();
         Calc calc = root.getCompiled(exp, true);
-        return calc.evaluate(evaluator);
+        Object o = calc.evaluate(evaluator);
+        if (o == Util.nullValue) {
+            o = null;
+        }
+        return o;
     }
 
     private void setExpanding(Member member) {