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

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

Author: mark.proctor at jboss.com
Date: 2008-02-01 09:12:16 -0500 (Fri, 01 Feb 2008)
New Revision: 18246

Modified:
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
Log:
JBRULES-1448 MVELDataProver throws nullpointer on null return value from expression
-reversed the order, seems nicer :)

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