[teiid-commits] teiid SVN: r1488 - trunk/engine/src/main/java/com/metamatrix/query/processor/proc.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-09-28 17:11:23 -0400 (Mon, 28 Sep 2009)
New Revision: 1488

Modified:
   trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ProcedurePlan.java
Log:
TEIID-849 fix for resolving subqueries in stored procedure parameters and for using the appropriate context information.

Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ProcedurePlan.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ProcedurePlan.java	2009-09-28 21:07:51 UTC (rev 1487)
+++ trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ProcedurePlan.java	2009-09-28 21:11:23 UTC (rev 1488)
@@ -83,6 +83,7 @@
 
 	// State initialized by processor
 	private ProcessorDataManager dataMgr;
+	private ProcessorDataManager parentDataMrg;
     private BufferManager bufferMgr;
     private int batchSize;
 
@@ -139,6 +140,7 @@
         this.batchSize = bufferMgr.getProcessorBatchSize();
         setContext(context);
         this.dataMgr = dataMgr;
+        this.parentDataMrg = dataMgr;
         if (evaluator == null) {
         	this.evaluator = new SubqueryAwareEvaluator(Collections.emptyMap(), getDataManager(), getContext(), this.bufferMgr);
         } 
@@ -318,6 +320,7 @@
         	this.evaluator.close();
         }
         this.tempTableStore = null;
+        this.dataMgr = parentDataMrg;
     }
 
     public String toString() {