MONDRIAN: Integration of change 15002 into the 3.4 branch.

[git-p4: depot-paths = "//open/mondrian-release/3.4/": change = 15006]
pentaho · Mar 15, 2012 · b64162c · b64162c
1 parent 7d373bd
commit b64162c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/mondrian/rolap/RolapResult.java b/src/main/mondrian/rolap/RolapResult.java
@@ -588,6 +588,7 @@ protected void loadMembers(
         evaluator.setCellReader(batchingReader);
         while (true) {
             axisMembers.clearAxisCount();
+            final int savepoint = evaluator.savepoint();
             try {
                 evalLoad(
                     nonAllMembers,
@@ -601,6 +602,8 @@ protected void loadMembers(
                 // Decrement count because it wasn't a recursive formula that
                 // caused the iteration.
                 --attempt;
+            } finally {
+                evaluator.restore(savepoint);
             }
 
             if (!phase()) {