Changeset 7194

Timestamp:

Aug 30, 2016, 8:40:51 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2027: Improve inter-communication between extensions

Switches search order so that the parent class loader is searched last. Fixed path to Hibernate JAR file.

Location:

trunk/src

Files:

• core/net/sf/basedb/util/JarClassLoader.java (modified) (3 diffs)
• test/data/JarPluginManifest.txt (modified) (1 diff)

trunk/src/core/net/sf/basedb/util/JarClassLoader.java

@@ -241 +241 @@
   }
 
+  @Override
+  public String toString() 
+  {
+    return super.toString() + "[" + mainJarFile + "]";
+  }
+
   /*
     From the ClassLoader class
@@ -369 +375 @@
     }
     
-    // 5. Delegate to parent class loader if it hasn't been done
-    if (c == null && !delegateFirst) 
-    {
-      c = loadClassInternal(parent, name);
-      if (log.isDebugEnabled()) log.debug("parent class (" + name + "): " + c);
-    }
-    
-    // 6. Side-load from proxied JAR files (eg. other extensions)
+    // 5. Side-load from proxied JAR files (eg. other extensions)
     Iterator<JarClassLoaderProxy> it = proxyLoaders.iterator();
     while (c == null && it.hasNext())
@@ -383 +382 @@
       c = proxyLoader.findClass(name);
       if (log.isDebugEnabled()) log.debug("proxy class (" + proxyLoader.jarPath + "; " + name + "): " + c);
+    }
+    
+    // 6. Delegate to parent class loader if it hasn't been done
+    if (c == null && !delegateFirst) 
+    {
+      c = loadClassInternal(parent, name);
+      if (log.isDebugEnabled()) log.debug("parent class (" + name + "): " + c);
     }
     

trunk/src/test/data/JarPluginManifest.txt

@@ -1 +1 @@
 Class-Path: ../../lib/dist/AffxFusion.jar 
- ../../lib/dist/hibernate-core-4.3.9.Final.jar
+ ../../lib/dist/hibernate-core-5.0.7.Final.jar