[jboss-svn-commits] JBL Code SVN: r15496 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools: rule and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2007-10-01 21:31:42 -0400 (Mon, 01 Oct 2007)
New Revision: 15496

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
Log:
JBRULES-1240 JBRULES-1240

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2007-10-02 01:00:58 UTC (rev 15495)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2007-10-02 01:31:42 UTC (rev 15496)
@@ -481,8 +481,6 @@
 
                 this.packageClassLoader.removeClassLoader( pkg.getPackageCompilationData().getClassLoader() );
 
-                pkg.clear();
-
                 // getting the list of referenced globals 
                 final Set referencedGlobals = new HashSet();
                 for ( final Iterator it = this.pkgs.values().iterator(); it.hasNext(); ) {
@@ -506,6 +504,9 @@
                 // removing the package itself from the list
                 this.pkgs.remove( pkg.getName() );
                 
+                //clear all members of the pkg
+                pkg.clear();
+                
                 this.eventSupport.fireAfterPackageRemoved( pkg );
                 
             } finally {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java	2007-10-02 01:00:58 UTC (rev 15495)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java	2007-10-02 01:31:42 UTC (rev 15496)
@@ -449,5 +449,11 @@
     public void clear() {
         this.rules.clear();
         this.packageCompilationData.clear();
+        this.ruleFlows.clear();       
+        this.imports.clear();
+        this.functions.clear();
+        this.staticImports.clear();
+        this.globals.clear();
+        this.factTemplates.clear();        
     }
 }
\ No newline at end of file