[jboss-svn-commits] JBL Code SVN: r18247 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders.

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

Author: tirelli
Date: 2008-02-01 09:24:24 -0500 (Fri, 01 Feb 2008)
New Revision: 18247

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
Log:
JBRULES-1448: fixing NPE on from

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java	2008-02-01 14:12:16 UTC (rev 18246)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java	2008-02-01 14:24:24 UTC (rev 18247)
@@ -57,8 +57,10 @@
             return ((Collection) result).iterator();
         } else if ( result instanceof Iterator ) {
             return (Iterator) result;
+        } else if ( result != null ){
+            return Collections.singletonList( result ).iterator();
         } else {
-            return Collections.singletonList( result ).iterator();
+            return Collections.EMPTY_LIST.iterator();
         }
     }
 }