Merge

src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java

@@ -493,9 +493,9 @@ public abstract class PartialCompositeContext implements Context, Resolver {
      * Tests whether a name contains a nonempty component.
      */
     protected static boolean allEmpty(Name name) {
-        Enumeration enum_ = name.getAll();
+        Enumeration<String> enum_ = name.getAll();
         while (enum_.hasMoreElements()) {
-            if (!enum_.equals("")) {
+            if (!enum_.nextElement().isEmpty()) {
                 return false;
             }
         }

src/share/classes/java/net/URLClassLoader.java

@@ -306,18 +306,13 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
     }
 
     /*
-     * Defines a Class using the class bytes obtained from the specified
-     * Resource. The resulting Class must be resolved before it can be
-     * used.
+     * Retrieve the package using the specified package name.
+     * If non-null, verify the package using the specified code
+     * source and manifest.
      */
-    private Class defineClass(String name, Resource res) throws IOException {
-        int i = name.lastIndexOf('.');
-        URL url = res.getCodeSourceURL();
-        if (i != -1) {
-            String pkgname = name.substring(0, i);
-            // Check if package already loaded.
+    private Package getAndVerifyPackage(String pkgname,
+                                        Manifest man, URL url) {
         Package pkg = getPackage(pkgname);
-            Manifest man = res.getManifest();
         if (pkg != null) {
             // Package found, so check package sealing.
             if (pkg.isSealed()) {
@@ -326,7 +321,6 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
                     throw new SecurityException(
                         "sealing violation: package " + pkgname + " is sealed");
                 }
-
             } else {
                 // Make sure we are not attempting to seal the package
                 // at this code source URL.
@@ -336,12 +330,38 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
                         ": already loaded");
                 }
             }
-            } else {
+        }
+        return pkg;
+    }
+
+    /*
+     * Defines a Class using the class bytes obtained from the specified
+     * Resource. The resulting Class must be resolved before it can be
+     * used.
+     */
+    private Class defineClass(String name, Resource res) throws IOException {
+        int i = name.lastIndexOf('.');
+        URL url = res.getCodeSourceURL();
+        if (i != -1) {
+            String pkgname = name.substring(0, i);
+            // Check if package already loaded.
+            Manifest man = res.getManifest();
+            if (getAndVerifyPackage(pkgname, man, url) == null) {
+                try {
                     if (man != null) {
                         definePackage(pkgname, man, url);
                     } else {
                         definePackage(pkgname, null, null, null, null, null, null, null);
                     }
+                } catch (IllegalArgumentException iae) {
+                    // parallel-capable class loaders: re-verify in case of a
+                    // race condition
+                    if (getAndVerifyPackage(pkgname, man, url) == null) {
+                        // Should never happen
+                        throw new AssertionError("Cannot find package " +
+                                                 pkgname);
+                    }
+                }
             }
         }
         // Now read the class bytes and define the class