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

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

Author: mark.proctor at jboss.com
Date: 2008-05-01 19:55:12 -0400 (Thu, 01 May 2008)
New Revision: 19829

Modified:
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/Rete.java
Log:
JBRULES-1443 retract of Fact Template leads to NPE

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/Rete.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/Rete.java	2008-05-01 23:30:22 UTC (rev 19828)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/reteoo/Rete.java	2008-05-01 23:55:12 UTC (rev 19829)
@@ -195,7 +195,10 @@
         final Object object = handle.getObject();
 
         ObjectTypeConf objectTypeConf;
-        if ( object instanceof ShadowProxy ) {
+        if ( object instanceof Fact ) {
+            String key = ((Fact) object).getFactTemplate().getName();
+            objectTypeConf = (ObjectTypeConf) memory.get( key );
+        } else if ( object instanceof ShadowProxy ) {
             objectTypeConf = (ObjectTypeConf) memory.get( ((ShadowProxy) object).getShadowedObject().getClass() );
         } else {
             objectTypeConf = (ObjectTypeConf) memory.get( object.getClass() );