[jboss-svn-commits] JBL Code SVN: r31874 - in labs/jbossrules/branches/true_modify_20100215: drools-core/src/main/java/org/drools/reteoo and 1 other directory.

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

Author: tirelli
Date: 2010-02-28 15:43:47 -0500 (Sun, 28 Feb 2010)
New Revision: 31874

Modified:
   labs/jbossrules/branches/true_modify_20100215/drools-compiler/src/test/resources/org/drools/integrationtests/waltz/waltz.drl
   labs/jbossrules/branches/true_modify_20100215/drools-core/src/main/java/org/drools/reteoo/FromNode.java
Log:
JBRULES-2339: JBRULES-2340: fixing tests

Modified: labs/jbossrules/branches/true_modify_20100215/drools-compiler/src/test/resources/org/drools/integrationtests/waltz/waltz.drl
===================================================================
--- labs/jbossrules/branches/true_modify_20100215/drools-compiler/src/test/resources/org/drools/integrationtests/waltz/waltz.drl	2010-02-28 20:27:55 UTC (rev 31873)
+++ labs/jbossrules/branches/true_modify_20100215/drools-compiler/src/test/resources/org/drools/integrationtests/waltz/waltz.drl	2010-02-28 20:43:47 UTC (rev 31874)
@@ -59,9 +59,9 @@
         $stage: Stage ( value == Stage.DUPLICATE )
         not ( Line() )
 	then
-	    modifyRetract( $stage );
-        $stage.setValue ( Stage.DETECT_JUNCTIONS );
-        modifyInsert( $stage );
+	    modify( $stage ) {
+            setValue( Stage.DETECT_JUNCTIONS );
+        }
     	//sysout.println("reversing done");
 end
 

Modified: labs/jbossrules/branches/true_modify_20100215/drools-core/src/main/java/org/drools/reteoo/FromNode.java
===================================================================
--- labs/jbossrules/branches/true_modify_20100215/drools-core/src/main/java/org/drools/reteoo/FromNode.java	2010-02-28 20:27:55 UTC (rev 31873)
+++ labs/jbossrules/branches/true_modify_20100215/drools-core/src/main/java/org/drools/reteoo/FromNode.java	2010-02-28 20:43:47 UTC (rev 31874)
@@ -300,12 +300,12 @@
 
         final FromMemory memory = (FromMemory) workingMemory.getNodeMemory( this );
         memory.betaMemory.getLeftTupleMemory().remove( leftTuple );
+        this.sink.propagateRetractLeftTuple( leftTuple,
+                                             context,
+                                             workingMemory );
         destroyCreatedHandles( workingMemory,
                                memory,
                                leftTuple );
-        this.sink.propagateRetractLeftTuple( leftTuple,
-                                             context,
-                                             workingMemory );
     }
 
     @SuppressWarnings("unchecked")