[teiid-commits] teiid SVN: r3343 - branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-07-27 13:52:49 -0400 (Wed, 27 Jul 2011)
New Revision: 3343

Modified:
   branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java
Log:
TEIID-1683 completing the merge of old case changes

Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java	2011-07-27 17:49:14 UTC (rev 3342)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLStagaingQueryPlanner.java	2011-07-27 17:52:49 UTC (rev 3343)
@@ -104,7 +104,7 @@
         ResultSetInfo rsInfo = sourceNode.getResultSetInfo();
 
         // If this node has been eligible for raising, it will be eligible for staging.
-        if (!rsInfo.isCriteriaRaised()) {
+        if (rsInfo.hasInputSet() && !rsInfo.isCriteriaRaised()) {
             return false;
         }