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

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

Author: tirelli
Date: 2008-03-18 13:27:15 -0400 (Tue, 18 Mar 2008)
New Revision: 19054

Modified:
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
Log:
JBRULES-1508: fixing NPE

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-03-18 17:07:45 UTC (rev 19053)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java	2008-03-18 17:27:15 UTC (rev 19054)
@@ -54,17 +54,17 @@
         //this.expression.
         final Object result = MVEL.executeExpression( this.expression,
                                                       factory );                
-        
-        if ( result instanceof Collection ) {
+
+        if ( result == null ) {
+            return Collections.EMPTY_LIST.iterator();           
+        } else if ( result instanceof Collection ) {
             return ((Collection) result).iterator();
         } else if ( result instanceof Iterator ) {
             return (Iterator) result;
         } else if ( result.getClass().isArray() ) { 
         	return new ArrayIterator( result );
-        } else if( result != null ){
+        } else {
             return Collections.singletonList( result ).iterator();
-        } else {
-        	return Collections.EMPTY_LIST.iterator();        	
         }
     }
 }