Fix issue #215 by making sure option scopes don't get comingled

ndw · Jul 30, 2015 · 3600f8b · 3600f8b
1 parent faea259
commit 3600f8b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/com/xmlcalabash/runtime/XAtomicStep.java b/src/main/java/com/xmlcalabash/runtime/XAtomicStep.java
@@ -345,6 +345,7 @@ public void run() throws SaxonApiException {
         // Calculate all the options
         DeclareStep decl = step.getDeclaration();
         inScopeOptions = parent.getInScopeOptions();
+        Hashtable<QName,RuntimeValue> futureOptions = new Hashtable<QName,RuntimeValue> ();
         for (QName name : step.getOptions()) {
             Option option = step.getOption(name);
             RuntimeValue value = computeValue(option);
@@ -362,7 +363,11 @@ public void run() throws SaxonApiException {
             }
 
             xstep.setOption(name, value);
-            inScopeOptions.put(name, value);
+            futureOptions.put(name, value);
+        }
+
+        for (QName opt : futureOptions.keySet()) {
+            inScopeOptions.put(opt, futureOptions.get(opt));
         }
 
         xstep.reset();