Changeset 4393

Timestamp:

Aug 13, 2008, 1:22:16 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1085: Implement JarClassLoader?.findResources method

File:

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

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

@@ -31 +31 @@
 import java.util.HashMap;
 import java.util.Enumeration;
+import java.util.Vector;
 import java.util.jar.JarFile;
 import java.util.jar.JarEntry;
@@ -178 +179 @@
     the class implementation can be found.
   */
-  private final Map<String, File> classPath;
+  private final Map<String, List<File>> classPath;
   
   /**
@@ -215 +216 @@
     this.jarTimeStamp = mainJarFile.lastModified();
     this.jarSize = mainJarFile.length();
-    classPath = new HashMap<String, File>();
+    classPath = new HashMap<String, List<File>>();
     jarFiles = new ArrayList<JarInfo>();
     loadJarFile(mainJarFile, true);
@@ -229 +230 @@
   {
     log.debug("findClass: " + name);
-    File file = classPath.get(classNameToPath(name));
-    if (file == null)
+    List<File> files = classPath.get(classNameToPath(name));
+    if (files == null || files.isEmpty())
     {
       throw new ClassNotFoundException(name);
     }
-    byte[] b = loadClassData(file, name);
+    byte[] b = loadClassData(files.get(0), name);
     return defineClass(name, b, 0, b.length);
   }
@@ -245 +246 @@
     try
     {
-      File file = classPath.get(name);
-      if (file != null)
-      {
-        String newUrl = "jar:"+file.toURI().toURL()+"!/"+name;
+      List<File> files = classPath.get(name);
+      if (files != null && files.size() > 0)
+      {
+        if (log.isDebugEnabled()) log.debug("Found: " + files);
+        String newUrl = "jar:"+files.get(0).toURI().toURL()+"!/"+name;
         url = new URL(newUrl);
+      }
+      else
+      {
+        log.debug("Not found: " + name);
+      }
+    }
+    catch (MalformedURLException ex)
+    {
+      ex.printStackTrace();
+    }
+    return url;
+  }
+  
+  @Override
+  protected Enumeration<URL> findResources(String name)
+  {
+    log.debug("findResources: " + name);
+    Enumeration<URL> url = null;
+    try
+    {
+      List<File> files = classPath.get(name);
+      if (files != null && files.size() > 0)
+      {
+        if (log.isDebugEnabled()) log.debug("Found: " + files);
+        Vector<URL> v = new Vector<URL>();
+        for (File f : files)
+        {
+          String newUrl = "jar:"+f.toURI().toURL()+"!/"+name;
+          v.add(new URL(newUrl));
+        }
+        url = v.elements();
       }
       else
@@ -276 +309 @@
     if (log.isDebugEnabled()) log.debug("getResource: " + name);
     return super.getResource(name);
+  }
+  
+  @Override
+  public Enumeration<URL> getResources(String name)
+    throws IOException
+  {
+    if (log.isDebugEnabled()) log.debug("getResources: " + name);
+    return super.getResources(name);
   }
   // -------------------------------------------
@@ -347 +388 @@
       if (jarEntry.isDirectory()) continue;
       String name = jarEntry.getName();
-      if (!classPath.containsKey(name))
-      {
-        log.trace("Adding: " + name);
-        classPath.put(name, file);
-      }
-      else
-      {
-        log.warn("Duplicate resource: '" + name + "' in '" + file + "'; also exists in '" 
-            + classPath.get(name) + "'");
-      }
+      log.trace("Adding: " + name);
+      List<File> list = classPath.get(name);
+      if (list == null)
+      {
+        list = new ArrayList<File>();
+        classPath.put(name, list);
+      }
+      list.add(file);
     }
     if (followClassPath)