Changeset 7718

Timestamp:

May 22, 2019, 9:56:58 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2139: Switch to Java 11 (or later)

Fixed the call to ClassLoader.getPackage() in JarClassLoader. It now uses the ClassLoader.getDefinedPackage() instead and iterates up the parent chain of class loaders.

File:

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

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

@@ -34 +34 @@
 import java.util.jar.JarEntry;
 import java.util.jar.Manifest;
+
 import java.util.jar.Attributes;
 import java.util.jar.Attributes.Name;
@@ -247 +248 @@
     {
       String packageName = name.substring(0, i);
-      @SuppressWarnings("deprecation")
-      Package pkg = getPackage(packageName);
-      if (pkg == null)
+      if (!isPackageDefined(packageName))
       {
         JarInfo info = jarFiles.get(file);
         Manifest mf = info != null ? info.manifest : null;
-        pkg = definePackage(packageName, mf);
+        definePackage(packageName, mf);
       }
     }
     Class<?> clazz = defineClass(name, b, 0, b.length);
     return clazz;
+  }
+  
+  // Safety limit to avoid endless loops in case parent class loaders are incorrectly linked
+  private static final int MAX_PARENTS = 20;
+  private boolean isPackageDefined(String name)
+  {
+    ClassLoader c = this;
+    for (int i = 0; c != null && i < MAX_PARENTS; i++)
+    {
+      if (c.getDefinedPackage(name) != null) return true;
+      c = c.getParent();
+    }
+    return false;
   }