[Jboss-svn-commits] JBL Code SVN: r4208 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools/integrationtests drools-compiler/src/test/resources/org/drools/integrationtests drools-core/src/main/java/org/drools/reteoo

[<jbo...@li...>]

Author: tirelli
Date: 2006-05-12 08:55:53 -0400 (Fri, 12 May 2006)
New Revision: 4208

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
Log:
Fixing JBRULES-267 - rule removal inconsistency

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-05-12 12:01:35 UTC (rev 4207)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-05-12 12:55:53 UTC (rev 4208)
@@ -1497,6 +1497,10 @@
         ruleBase.removeRule( "org.drools.test",
                              "like cheese" );
 
+        Cheese muzzarela = new Cheese( "muzzarela",
+                                     5 );
+        workingMemory.assertObject( muzzarela );
+
         assertEquals( 4,
                       workingMemory.getAgenda().getActivations().length );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl	2006-05-12 12:01:35 UTC (rev 4207)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl	2006-05-12 12:55:53 UTC (rev 4208)
@@ -4,8 +4,8 @@
 
 rule "rule1"
     when
-        #Cheese( type : type, price : price -> (price.intValue() > 1))
-        Cheese( type : type, price > 1 )
+        Cheese( type : type, price : price -> (price.intValue() > 1))
+        #Cheese( type : type, price > 1 )
     then
 		assertLogical( type );
 end

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl	2006-05-12 12:01:35 UTC (rev 4207)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl	2006-05-12 12:55:53 UTC (rev 4208)
@@ -4,8 +4,8 @@
 
 rule "rule2"
     when
-        #Cheese( type : type, price : price -> (price.intValue() < 3))
-        Cheese( type : type, price < 3)
+        Cheese( type : type, price : price -> (price.intValue() < 3))
+        #Cheese( type : type, price < 3)
     then
 		assertLogical( type );
 end
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java	2006-05-12 12:01:35 UTC (rev 4207)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java	2006-05-12 12:55:53 UTC (rev 4208)
@@ -204,7 +204,7 @@
 
     public void remove(BaseNode node,
                        WorkingMemoryImpl[] workingMemories) {
-        getObjectSinks().remove( node );
+        this.objectSinks.remove( (ObjectSink) node );
         removeShare();
         if ( this.sharedCount < 0 ) {
             for ( int i = 0, length = workingMemories.length; i < length; i++ ) {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java	2006-05-12 12:01:35 UTC (rev 4207)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java	2006-05-12 12:55:53 UTC (rev 4208)
@@ -214,7 +214,7 @@
 
     public void remove(BaseNode node,
                        WorkingMemoryImpl[] workingMemories) {
-        getObjectSinks().remove( node );
+        this.objectSinks.remove( (ObjectSink) node );
         removeShare();
         if ( this.sharedCount < 0 ) {
             for ( int i = 0, length = workingMemories.length; i < length; i++ ) {