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

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

Author: tirelli
Date: 2010-03-11 18:48:55 -0500 (Thu, 11 Mar 2010)
New Revision: 32046

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
Log:
JBRULES-2339: JBRULES-2440: fixing NPE

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java	2010-03-11 20:58:49 UTC (rev 32045)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java	2010-03-11 23:48:55 UTC (rev 32046)
@@ -861,7 +861,7 @@
         matchings[0] = getFirstMatch( parent,
                                       accctx,
                                       isUpdatingSink );
-        matchings[1] = parent.lastChild;
+        matchings[1] = matchings[0] != null ? parent.lastChild : null;
 
         // update the tuple for the actual propagations
         if ( matchings[0] != null ) {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2010-03-11 20:58:49 UTC (rev 32045)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2010-03-11 23:48:55 UTC (rev 32046)
@@ -772,7 +772,7 @@
         matchings[0] = getFirstMatch( parent,
                                       colctx,
                                       isUpdatingSink );
-        matchings[1] = parent.lastChild;
+        matchings[1] = matchings[0] != null ? parent.lastChild : null;
 
         // update the tuple for the actual propagations
         if ( matchings[0] != null ) {