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

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

Author: fmeyer
Date: 2008-02-01 13:47:48 -0500 (Fri, 01 Feb 2008)
New Revision: 18258

Modified:
   labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
Log:
SOA-381  MVELDataProver throws nullpointer on null return value from expression JBRULES-1448


Modified: labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
===================================================================
--- labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java	2008-02-01 18:27:15 UTC (rev 18257)
+++ labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java	2008-02-01 18:47:48 UTC (rev 18258)
@@ -48,8 +48,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();
         }
     }
 }