[teiid-commits] teiid SVN: r924 - in trunk/engine/src: test/java/org/teiid/dqp/internal/process/multisource and 1 other directory.

Author: shawkins Date: 2009-05-12 21:45:00 -0400 (Tue, 12 May 2009) New Revision: 924 Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/AccessNode.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java Log: TEIID-583 ensuring that the connectorbindingid is passed by the access node. Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/AccessNode.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/AccessNode.java 2009-05-13 01:37:34 UTC (rev 923) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/AccessNode.java 2009-05-13 01:45:00 UTC (rev 924) @@ -103,7 +103,7 @@ isUpdate = RelationalNodeUtil.isUpdate(atomicCommand); if(needProcessing) { - this.tupleSource = getDataManager().registerRequest(this.getContext().getProcessorID(), atomicCommand, modelName, null, getID()); + this.tupleSource = getDataManager().registerRequest(this.getContext().getProcessorID(), atomicCommand, modelName, connectorBindingId, getID()); } } Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2009-05-13 01:37:34 UTC (rev 923) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2009-05-13 01:45:00 UTC (rev 924) @@ -77,7 +77,9 @@ } public TupleSource registerRequest(Object processorID, Command command, String modelName, String connectorBindingId, int nodeID) throws com.metamatrix.api.exception.MetaMatrixComponentException { - Collection elements = ElementCollectorVisitor.getElements(command, true, true); + assertNotNull(connectorBindingId); + + Collection elements = ElementCollectorVisitor.getElements(command, true, true); for (Iterator i = elements.iterator(); i.hasNext();) { ElementSymbol symbol = (ElementSymbol)i.next();