[JBRULES-3347] set a ClassLoader on the ClassPathResource after deser…

…ialization
kiegroup · Apr 3, 2012 · fb82996 · fb82996
1 parent 13f361f
commit fb82996
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java b/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java
@@ -131,7 +131,7 @@ public KnowledgeAgentImpl(String name,
             this.newInstance = ((KnowledgeAgentConfigurationImpl) configuration).isNewInstance();
             this.useKBaseClassLoaderForCompiling = ((KnowledgeAgentConfigurationImpl) configuration).isUseKBaseClassLoaderForCompiling();
             this.notifier = (ResourceChangeNotifierImpl) ResourceFactory.getResourceChangeNotifierService();
-            if ( ((KnowledgeAgentConfigurationImpl) configuration).isMonitorChangeSetEvents() ) {
+            if ( configuration.isMonitorChangeSetEvents() ) {
                 monitor = true;
             }
 
@@ -1143,6 +1143,10 @@ public boolean addDefinitionMapping(Resource resource,
 
         boolean isNewDefinition = true;
 
+        if ( resource instanceof ClassPathResource && ((ClassPathResource)resource).getClassLoader() == null ) {
+            ((ClassPathResource)resource).setClassLoader( ((InternalRuleBase)((KnowledgeBaseImpl) kbase).getRuleBase()).getRootClassLoader() );
+        }
+
         if ( definition != null ) {
             isNewDefinition = this.registeredResources.putDefinition( resource,
                                                                       definition );
@@ -1378,6 +1382,7 @@ public void dispose() {
      */
     @Override
     protected void finalize() throws Throwable {
+        super.finalize();
         // users should turn off monitoring, but just in case when this class is
         // GC'd we turn off the thread
         if ( this.changeSetNotificationDetector != null ) {

diff --git a/drools-core/src/main/java/org/drools/io/impl/BaseResource.java b/drools-core/src/main/java/org/drools/io/impl/BaseResource.java
@@ -16,7 +16,6 @@
 
 package org.drools.io.impl;
 
-import java.io.Externalizable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;

diff --git a/drools-core/src/main/java/org/drools/io/impl/ClassPathResource.java b/drools-core/src/main/java/org/drools/io/impl/ClassPathResource.java
@@ -198,6 +198,10 @@ public ClassLoader getClassLoader() {
         return this.classLoader;
     }
 
+    public void setClassLoader(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
+
     public Class<?> getClazz() {
         return this.clazz;
     }