[jboss-svn-commits] JBL Code SVN: r7428 - labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/common

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

Author: tirelli
Date: 2006-11-07 11:46:19 -0500 (Tue, 07 Nov 2006)
New Revision: 7428

Modified:
   labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
Log:
JBRULES-542: fixing removal of property change listener

Modified: labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2006-11-07 16:45:38 UTC (rev 7427)
+++ labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2006-11-07 16:46:19 UTC (rev 7428)
@@ -40,7 +40,6 @@
 import org.drools.event.AgendaEventSupport;
 import org.drools.event.WorkingMemoryEventListener;
 import org.drools.event.WorkingMemoryEventSupport;
-import org.drools.reteoo.ReteooWorkingMemory;
 import org.drools.rule.Rule;
 import org.drools.spi.Activation;
 import org.drools.spi.AgendaFilter;
@@ -584,11 +583,13 @@
         try {
             object = getObject( handle );
 
-            final Method mehod = handle.getClass().getMethod( "removePropertyChangeListener",
-                                                              AbstractWorkingMemory.ADD_REMOVE_PROPERTY_CHANGE_LISTENER_ARG_TYPES );
+            if(object != null) {
+                final Method mehod = object.getClass().getMethod( "removePropertyChangeListener",
+                                                                  AbstractWorkingMemory.ADD_REMOVE_PROPERTY_CHANGE_LISTENER_ARG_TYPES );
 
-            mehod.invoke( handle,
-                          this.addRemovePropertyChangeListenerArgs );
+                mehod.invoke( object,
+                              this.addRemovePropertyChangeListenerArgs );
+            }
         } catch ( final NoSuchMethodException e ) {
             // The removePropertyChangeListener method on the class
             // was not found so Drools will be unable to