Changeset 7196

Timestamp:

Aug 30, 2016, 1:48:40 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #2027: Improve inter-communication between extensions

Fixed the findResource(), findResources() and hasChanged() methods so that they also search the proxied JAR files.

File:

• trunk/src/core/net/sf/basedb/util/JarClassLoader.java (modified) (4 diffs)

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

@@ -417 +417 @@
     if (url == null) url = findResource(name);
 
+    // 3. Side-load from proxied JAR files (eg. other extensions)
+    if (url == null)
+    {
+      Iterator<JarClassLoaderProxy> it = proxyLoaders.iterator();
+      while (url == null && it.hasNext())
+      {
+        JarClassLoaderProxy proxyLoader = it.next();
+        url = proxyLoader.findResource(name);
+      }
+    }
+
     // 3. Check with parent loader if not done so already
     if (url == null && !delegateFirst)
@@ -442 +453 @@
     if (delegateFirst) addResources(resources, parentResources);
     addResources(resources, myResources);
+    Iterator<JarClassLoaderProxy> it = proxyLoaders.iterator();
+    while (it.hasNext())
+    {
+      JarClassLoaderProxy proxyLoader = it.next();
+      addResources(resources, proxyLoader.findResources(name));
+    }
+
     if (!delegateFirst) addResources(resources, parentResources);
     
@@ -498 +516 @@
         }
         if (!isSame) return true;
+      }
+      for (JarClassLoaderProxy proxy : proxyLoaders)
+      {
+        if (proxy.hasChanged()) return true;
       }
     }
@@ -846 +868 @@
       return c;
     }
+    
+    URL findResource(String name)
+    {
+      if (log.isDebugEnabled()) log.debug("JarClassLoaderProxy.findResource[" + jarPath + "]: " + name);
+      if (!isInitialized) init();
+      
+      URL url = null;
+      if (loader != null)
+      {
+        url = loader.findResource(name);
+      }
+      return url;
+    }
+    
+    Enumeration<URL> findResources(String name)
+    {
+      if (log.isDebugEnabled()) log.debug("JarClassLoaderProxy.findResources[" + jarPath + "]: " + name);
+      if (!isInitialized) init();
+      
+      Enumeration<URL> url = null;
+      if (loader != null)
+      {
+        url = loader.findResources(name);
+      }
+      return url;
+    }
+    
+    boolean hasChanged()
+    {
+      if (!isInitialized) return false;
+      if (loader != null) return loader.hasChanged(true);
+      return new File(jarPath).exists();
+    }
   }
 }