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

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

Author: mark.proctor at jboss.com
Date: 2007-04-16 09:34:04 -0400 (Mon, 16 Apr 2007)
New Revision: 11004

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java
Log:
JBRULES-788 lock-on-activate rule attribute
-need an extra null check

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java	2007-04-16 13:31:48 UTC (rev 11003)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java	2007-04-16 13:34:04 UTC (rev 11004)
@@ -129,7 +129,11 @@
         }
 
         final ObjectHashMap tuples = (ObjectHashMap) this.retracted.get( rule );
-        return ( Activation ) tuples.remove( tuple );
+        if  ( tuples != null ) {
+            return ( Activation ) tuples.remove( tuple );
+        } else {
+            return null;
+        }
     }
 
     public void clearRetractedTuples() {