[jboss-svn-commits] JBL Code SVN: r19095 - in labs/jbossrules/trunk/drools-compiler/src: test/resources/org/drools/integrationtests and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2008-03-18 23:57:16 -0400 (Tue, 18 Mar 2008)
New Revision: 19095

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyBlock.drl
Log:
JBRULES-1501 Multiples modify causes variable duplication exception
-restored regressed fix

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java	2008-03-19 02:36:02 UTC (rev 19094)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java	2008-03-19 03:57:16 UTC (rev 19095)
@@ -180,6 +180,7 @@
             }
 
             // adding modify expression
+            consequence.append( "{\n" );
             consequence.append( ret.getName() );
             consequence.append( " __obj__ = (" );
             consequence.append( ret.getName() );
@@ -197,6 +198,7 @@
             }
             // adding the modifyInsert call:
             consequence.append( "modifyInsert( __obj__ );" );
+            consequence.append( "}\n" );
         }
         consequence.append( originalCode.substring( lastAdded ) );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyBlock.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyBlock.drl	2008-03-19 02:36:02 UTC (rev 19094)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyBlock.drl	2008-03-19 03:57:16 UTC (rev 19095)
@@ -7,6 +7,6 @@
     $p: Person( status == "hungry" )
     $c: Cheese( )
 then
-    modify( $c ) {setPrice (10) }
-    modify( $p ) {setStatus("fine") }
+    modify( $c ) {setPrice (10) };
+    modify( $p ) {setStatus("fine") };
 end
\ No newline at end of file