[jboss-svn-commits] JBL Code SVN: r22505 - labs/jbossrules/soa_tags/4.3.0.GA_IR1_JDK6/drools-core/src/main/java/org/drools/common.

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

Author: jervisliu
Date: 2008-09-08 04:00:02 -0400 (Mon, 08 Sep 2008)
New Revision: 22505

Modified:
   labs/jbossrules/soa_tags/4.3.0.GA_IR1_JDK6/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
Log:
fix a class loader issue specific to jdk6

Modified: labs/jbossrules/soa_tags/4.3.0.GA_IR1_JDK6/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/soa_tags/4.3.0.GA_IR1_JDK6/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2008-09-08 07:58:51 UTC (rev 22504)
+++ labs/jbossrules/soa_tags/4.3.0.GA_IR1_JDK6/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2008-09-08 08:00:02 UTC (rev 22505)
@@ -486,13 +486,14 @@
         // Add invokers
         compilationData.putAllInvokers( newCompilationData.getInvokers() );
 
-        if ( compilationData.isDirty() ) {
-            if ( this.reloadPackageCompilationData == null ) {
-                this.reloadPackageCompilationData = new ReloadPackageCompilationData();
-            }
-            this.reloadPackageCompilationData.addPackageCompilationData( compilationData );
-        }
+        //Force a reload to make sure components from two merged packages are sharing same class loader.
+        if (this.reloadPackageCompilationData == null) {
+			this.reloadPackageCompilationData = new ReloadPackageCompilationData();
+		}
+		this.reloadPackageCompilationData
+				.addPackageCompilationData(compilationData);
 
+
         // Add globals
         for ( final Iterator it = newPkg.getGlobals().keySet().iterator(); it.hasNext(); ) {
             final String identifier = (String) it.next();