[jboss-svn-commits] JBL Code SVN: r35457 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2010-10-07 14:10:44 -0400 (Thu, 07 Oct 2010)
New Revision: 35457

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java
Log:
-fixing NPE

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java	2010-10-07 16:47:26 UTC (rev 35456)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java	2010-10-07 18:10:44 UTC (rev 35457)
@@ -53,7 +53,7 @@
         this.outIdentifier = outIdentifier;
         this.name = name;
         if ( arguments != null ) {
-        this.arguments = Arrays.asList( arguments );
+            this.arguments = Arrays.asList( arguments );
         } else {
             this.arguments = Collections.EMPTY_LIST;
         }
@@ -75,11 +75,14 @@
     }
     public List<Object> getArguments() {
         if (this.arguments == null) {
-            this.arguments = new ArrayList<Object>();
+            this.arguments = Collections.emptyList();
         }
         return this.arguments;
     }
     public void setArguments(List<Object> arguments) {
+        if ( arguments == null || arguments.isEmpty() ) {
+            this.arguments = Collections.emptyList();
+        }
         this.arguments = arguments;
     }
 
@@ -87,15 +90,12 @@
         StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
         
         QueryResults results = null;
-
-        //TODO {bauna} remove this try
-        try {
-			results = ksession.getQueryResults( name, this.arguments.toArray() );
-		} catch (Throwable e) {
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
+        if ( this.arguments == null || this.arguments.isEmpty() ) {
+            this.arguments = Collections.emptyList();
+        }
         
+        results = ksession.getQueryResults( name, this.arguments.toArray() );        
+        
         if ( this.outIdentifier != null ) {
             ((StatefulKnowledgeSessionImpl)ksession).session.getExecutionResult().getResults().put( this.outIdentifier, results );
         }