TEIIDDES-1704 Added NULL check on getResultSetColumns() call

Teiid-Designer · May 3, 2013 · 9c6c95e · 9c6c95e
1 parent 64680e4
commit 9c6c95e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/lang/util/CommandHelper.java b/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/lang/util/CommandHelper.java
@@ -30,7 +30,11 @@ public static List<IExpression> getProjectedSymbols(final ICommand command) {
         Set<IExpression> theSymbols = new LinkedHashSet<IExpression>();
 
         theSymbols.addAll(command.getProjectedSymbols());
-        theSymbols.addAll(command.getResultSetColumns());
+
+        // Teiid ICommand.getResultSetColumns() may return NULL so need to check before adding to Set
+        if( command.getResultSetColumns() != null ) {
+        	theSymbols.addAll(command.getResultSetColumns());
+        }
 
         List<IExpression> symbols = new ArrayList(theSymbols.size());
         symbols.addAll(theSymbols);