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

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

Author: mark.proctor at jboss.com
Date: 2008-03-12 00:38:28 -0400 (Wed, 12 Mar 2008)
New Revision: 18872

Modified:
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
Log:
JBRULES-1482 Bug with ReeteoRuleBase and merged package

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2008-03-12 04:37:22 UTC (rev 18871)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2008-03-12 04:38:28 UTC (rev 18872)
@@ -428,9 +428,6 @@
             final Rule[] rules = newPkg.getRules();
 
             for ( int i = 0; i < rules.length; ++i ) {
-            	if ( pkg != null && pkg.getRule( rules[i].getName() ) != null ) {
-            		removeRule( pkg, pkg.getRule( rules[i].getName() ) );
-            	}
                 addRule( newPkg,
                          rules[i] );
             }
@@ -507,9 +504,13 @@
         final Rule[] newRules = newPkg.getRules();
         for ( int i = 0; i < newRules.length; i++ ) {
             final Rule newRule = newRules[i];
-            if ( pkg.getRule( newRule.getName() ) == null ) {
-                pkg.addRule( newRule );
+
+            // remove the rule if it already exists
+            if ( pkg.getRule( newRule.getName() ) != null ) {
+                removeRule( pkg, pkg.getRule( newRule.getName() ) );
             }
+            
+            pkg.addRule( newRule );            
         }
 
         //and now the rule flows