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

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

Author: tirelli
Date: 2008-03-19 09:41:22 -0400 (Wed, 19 Mar 2008)
New Revision: 19115

Modified:
   labs/jbossrules/branches/fixing_bad_merge/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
Log:
reapplying commit #19055

Modified: labs/jbossrules/branches/fixing_bad_merge/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java	2008-03-19 13:40:11 UTC (rev 19114)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java	2008-03-19 13:41:22 UTC (rev 19115)
@@ -73,16 +73,16 @@
         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 ){
+            return new ArrayIterator( result );
+        } else {
             return Collections.singletonList( result ).iterator();
-        } else {
-            return Collections.EMPTY_LIST.iterator();
         }
     }
 }