MONDRIAN: Oops! And one missed file.

[git-p4: depot-paths = "//open/mondrian/": change = 12733]
pentaho · May 16, 2009 · f31ed41 · f31ed41
1 parent af76b90
commit f31ed41
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/main/mondrian/olap/fun/JavaFunDef.java b/src/main/mondrian/olap/fun/JavaFunDef.java
@@ -338,6 +338,7 @@ public JavaMethodCalc(
         }
 
         public Object evaluate(Evaluator evaluator) {
+            final Calc[] calcs = getCalcs();
             for (int i = 0; i < args.length; i++) {
                 args[i] = calcs[i].evaluate(evaluator);
                 if (args[i] == null) {

diff --git a/src/main/mondrian/olap/fun/SumFunDef.java b/src/main/mondrian/olap/fun/SumFunDef.java
@@ -16,7 +16,6 @@
 import mondrian.mdx.ResolvedFunCall;
 
 import java.util.List;
-import java.util.Collections;
 
 /**
  * Definition of the <code>Sum</code> MDX function.
@@ -92,8 +91,10 @@ protected Calc compileCall(
             return genIterCalc(call, ncalc, calc);
         }
     }
-    protected Calc genIterCalc(final ResolvedFunCall call,
-            final Calc ncalc, final Calc calc) {
+
+    protected Calc genIterCalc(
+        final ResolvedFunCall call, final Calc ncalc, final Calc calc)
+    {
         return new AbstractDoubleCalc(call, new Calc[] {ncalc, calc}) {
             public double evaluateDouble(Evaluator evaluator) {
                 IterCalc iterCalc = (IterCalc) ncalc;
@@ -102,29 +103,22 @@ public double evaluateDouble(Evaluator evaluator) {
                 return sumDouble(evaluator.push(), iterable, calc);
             }
 
-            public Calc[] getCalcs() {
-                return new Calc[] {ncalc, calc};
-            }
-
             public boolean dependsOn(Dimension dimension) {
                 return anyDependsButFirst(getCalcs(), dimension);
             }
         };
     }
 
-    protected Calc genListCalc(final ResolvedFunCall call,
-            final Calc ncalc, final Calc calc) {
+    protected Calc genListCalc(
+        final ResolvedFunCall call, final Calc ncalc, final Calc calc)
+    {
         return new AbstractDoubleCalc(call, new Calc[] {ncalc, calc}) {
             public double evaluateDouble(Evaluator evaluator) {
                 ListCalc listCalc = (ListCalc) ncalc;
                 List memberList = evaluateCurrentList(listCalc, evaluator);
                 return sumDouble(evaluator.push(false), memberList, calc);
             }
 
-            public Calc[] getCalcs() {
-                return new Calc[] {ncalc, calc};
-            }
-
             public boolean dependsOn(Dimension dimension) {
                 return anyDependsButFirst(getCalcs(), dimension);
             }