harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r489658 - in /harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/net/URLClassLoader.java test/java/tests/api/java/net/URLClassLoaderTest.java
Date Fri, 22 Dec 2006 14:17:15 GMT
Author: tellison
Date: Fri Dec 22 06:17:14 2006
New Revision: 489658

URL: http://svn.apache.org/viewvc?view=rev&rev=489658
Log:
Fix for HARMONY-2357 ([classlib] [luni] Method findClass() in class URLClassLoader throws
ClassNotFoundException)

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java?view=diff&rev=489658&r1=489657&r2=489658
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java
Fri Dec 22 06:17:14 2006
@@ -987,172 +987,169 @@
         boolean readAvailable = false;
         boolean findInExtensions = searchURLs == urls;
         final String name = new StringBuffer(clsName.replace('.', '/')).append(
-                ".class").toString();
+                ".class").toString(); //$NON-NLS-1$
         for (int i = 0; i < searchURLs.length; i++) {
-            if (searchURLs[i] != null) {
-                Manifest manifest = null;
-                InputStream is = null;
-                JarEntry entry = null;
-                JarFile jf = null;
-                byte[] clBuf = null;
-                try {
-                    URL thisURL = searchURLs[i];
-                    String protocol = thisURL.getProtocol();
-                    if (protocol.equals("jar")) {
-                        jf = resCache.get(thisURL);
-                        if (jf == null) {
-                            // If the connection for testURL or thisURL is used,
-                            // getJarFile() will throw an exception if the entry
-                            // doesn't exist.
-                            URL jarURL = ((JarURLConnection) thisURL
-                                    .openConnection()).getJarFileURL();
-                            try {
-                                JarURLConnection juc = (JarURLConnection) new URL(
-                                        "jar", "", jarURL.toExternalForm()
-                                                + "!/").openConnection();
-                                jf = juc.getJarFile();
-                                resCache.put(thisURL, jf);
-                            } catch (IOException e) {
-                                // Don't look for this jar file again
-                                searchURLs[i] = null;
-                                throw e;
-                            }
-                        }
-                        if (thisURL.getFile().endsWith("!/")) {
-                            entry = jf.getJarEntry(name);
-                        } else {
-                            String file = thisURL.getFile();
-                            int sepIdx = file.lastIndexOf("!/");
-                            if (sepIdx == -1) {
-                                // Invalid URL, don't look here again
-                                searchURLs[i] = null;
-                                continue;
-                            }
-                            sepIdx += 2;
-                            String entryName = new StringBuffer(file.length()
-                                    - sepIdx + name.length()).append(
-                                    file.substring(sepIdx)).append(name)
-                                    .toString();
-                            entry = jf.getJarEntry(entryName);
-                        }
-                        if (entry != null) {
-                            readAvailable = true;
-                            is = jf.getInputStream(entry);
-                            manifest = jf.getManifest();
-                        }
-                    } else if (protocol.equals("file")) {
-                        String filename = thisURL.getFile();
-                        String host = thisURL.getHost();
-                        if (host != null && host.length() > 0) {
-                            filename = new StringBuffer(host.length()
-                                    + filename.length() + name.length() + 2)
-                                    .append("//").append(host).append(filename)
-                                    .append(name).toString();
-                        } else {
-                            filename = new StringBuffer(filename.length()
-                                    + name.length()).append(filename).append(
-                                    name).toString();
-                        }
-
-                        //Just return null for caller to throw ClassNotFoundException.
+            Manifest manifest = null;
+            InputStream is = null;
+            JarEntry entry = null;
+            JarFile jf = null;
+            byte[] clBuf = null;
+            try {
+                URL thisURL = searchURLs[i];
+                String protocol = thisURL.getProtocol();
+                if (protocol.equals("jar")) { //$NON-NLS-1$
+                    jf = resCache.get(thisURL);
+                    if (jf == null) {
+                        // If the connection for testURL or thisURL is used,
+                        // getJarFile() will throw an exception if the entry
+                        // doesn't exist.
+                        URL jarURL = ((JarURLConnection) thisURL
+                                .openConnection()).getJarFileURL();
                         try {
-                            filename = URLDecoder.decode(filename, "UTF-8");
-                        } catch (IllegalArgumentException e) {
-                            return null;
+                            JarURLConnection juc = (JarURLConnection) new URL(
+                                    "jar", "", jarURL.toExternalForm() + "!/") //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
+                                    .openConnection();
+                            jf = juc.getJarFile();
+                            resCache.put(thisURL, jf);
+                        } catch (IOException e) {
+                            // Don't look for this jar file again
+                            searchURLs[i] = null;
+                            throw e;
                         }
-
-                        File file = new File(filename);
-                        // Don't throw exceptions for speed
-                        if (file.exists()) {
-                            is = new FileInputStream(file);
-                            readAvailable = true;
-                        } else {
+                    }
+                    if (thisURL.getFile().endsWith("!/")) {
+                        entry = jf.getJarEntry(name);
+                    } else {
+                        String file = thisURL.getFile();
+                        int sepIdx = file.lastIndexOf("!/");
+                        if (sepIdx == -1) {
+                            // Invalid URL, don't look here again
+                            searchURLs[i] = null;
                             continue;
                         }
+                        sepIdx += 2;
+                        String entryName = new StringBuffer(file.length()
+                                - sepIdx + name.length()).append(
+                                file.substring(sepIdx)).append(name).toString();
+                        entry = jf.getJarEntry(entryName);
+                    }
+                    if (entry != null) {
+                        readAvailable = true;
+                        is = jf.getInputStream(entry);
+                        manifest = jf.getManifest();
+                    }
+                } else if (protocol.equals("file")) {
+                    String filename = thisURL.getFile();
+                    String host = thisURL.getHost();
+                    if (host != null && host.length() > 0) {
+                        filename = new StringBuffer(host.length()
+                                + filename.length() + name.length() + 2)
+                                .append("//").append(host).append(filename)
+                                .append(name).toString();
+                    } else {
+                        filename = new StringBuffer(filename.length()
+                                + name.length()).append(filename).append(name)
+                                .toString();
+                    }
+
+                    // Just return null for caller to throw
+                    // ClassNotFoundException.
+                    try {
+                        filename = URLDecoder.decode(filename, "UTF-8");
+                    } catch (IllegalArgumentException e) {
+                        return null;
+                    }
+
+                    File file = new File(filename);
+                    // Don't throw exceptions for speed
+                    if (file.exists()) {
+                        is = new FileInputStream(file);
+                        readAvailable = true;
                     } else {
-                        is = targetURL(thisURL, name).openStream();
+                        continue;
                     }
-                } catch (MalformedURLException e) {
-                    // Keep iterating through the URL list
+                } else {
+                    is = targetURL(thisURL, name).openStream();
+                }
+            } catch (MalformedURLException e) {
+                // Keep iterating through the URL list
+            } catch (IOException e) {
+            }
+            if (is != null) {
+                URL codeSourceURL = null;
+                Certificate[] certificates = null;
+                CodeSource codeS = null;
+                try {
+                    codeSourceURL = findInExtensions ? orgUrls[i]
+                            : ((JarURLConnection) searchURLs[i]
+                                    .openConnection()).getJarFileURL();
                 } catch (IOException e) {
+                    codeSourceURL = searchURLs[i];
                 }
                 if (is != null) {
-                    URL codeSourceURL = null;
-                    Certificate[] certificates = null;
-                    CodeSource codeS = null;
                     try {
-                        codeSourceURL = findInExtensions ? orgUrls[i]
-                                : ((JarURLConnection) searchURLs[i]
-                                        .openConnection()).getJarFileURL();
+                        clBuf = getBytes(is, readAvailable);
+                        is.close();
                     } catch (IOException e) {
-                        codeSourceURL = searchURLs[i];
-                    }
-                    if (is != null) {
-                        try {
-                            clBuf = getBytes(is, readAvailable);
-                            is.close();
-                        } catch (IOException e) {
-                            return null;
-                        }
-                    }
-                    if (entry != null) {
-                        certificates = entry.getCertificates();
+                        return null;
                     }
-                    // Use the original URL, not the possible jar URL
-                    codeS = new CodeSource(codeSourceURL, certificates);
-                    int dotIndex = clsName.lastIndexOf(".");
-                    if (dotIndex != -1) {
-                        String packageName = clsName.substring(0, dotIndex);
-                        synchronized (this) {
-                            Package packageObj = getPackage(packageName);
-                            if (packageObj == null) {
-                                if (manifest != null) {
-                                    definePackage(packageName, manifest,
-                                            codeSourceURL);
-                                } else {
-                                    definePackage(packageName, null, null,
-                                            null, null, null, null, null);
-                                }
+                }
+                if (entry != null) {
+                    certificates = entry.getCertificates();
+                }
+                // Use the original URL, not the possible jar URL
+                codeS = new CodeSource(codeSourceURL, certificates);
+                int dotIndex = clsName.lastIndexOf(".");
+                if (dotIndex != -1) {
+                    String packageName = clsName.substring(0, dotIndex);
+                    synchronized (this) {
+                        Package packageObj = getPackage(packageName);
+                        if (packageObj == null) {
+                            if (manifest != null) {
+                                definePackage(packageName, manifest,
+                                        codeSourceURL);
                             } else {
-                                boolean exception = false;
-                                if (manifest != null) {
-                                    String dirName = packageName.replace('.',
-                                            '/')
-                                            + "/";
-                                    if (isSealed(manifest, dirName)) {
-                                        exception = !packageObj
-                                                .isSealed(codeSourceURL);
-                                    }
-                                } else {
-                                    exception = packageObj.isSealed();
-                                }
-                                if (exception) {
-                                    throw new SecurityException(
-                                            org.apache.harmony.luni.util.Msg
-                                                    .getString("K004c"));
+                                definePackage(packageName, null, null, null,
+                                        null, null, null, null);
+                            }
+                        } else {
+                            boolean exception = false;
+                            if (manifest != null) {
+                                String dirName = packageName.replace('.', '/')
+                                        + "/";
+                                if (isSealed(manifest, dirName)) {
+                                    exception = !packageObj
+                                            .isSealed(codeSourceURL);
                                 }
+                            } else {
+                                exception = packageObj.isSealed();
+                            }
+                            if (exception) {
+                                throw new SecurityException(
+                                        org.apache.harmony.luni.util.Msg
+                                                .getString("K004c"));
                             }
                         }
                     }
-                    return defineClass(clsName, clBuf, 0, clBuf.length, codeS);
                 }
-                if ((jf != null) && findInExtensions) {
-                    if (indexes[i] != null) {
-                        try {
-                            Class<?> c = (Class<?>) findInIndex(i, clsName, null,
-                                    false);
-                            if (c != null) {
-                                return c;
-                            }
-                        } catch (InvalidJarIndexException ex) {
-                            // Ignore misleading/wrong jar index
-                        }
-                    } else {
-                        Class<?> c = (Class<?>) findInExtensions(explore(
-                                searchURLs[i], i), clsName, i, null, false);
+                return defineClass(clsName, clBuf, 0, clBuf.length, codeS);
+            }
+            if ((jf != null) && findInExtensions) {
+                if (indexes[i] != null) {
+                    try {
+                        Class<?> c = (Class<?>) findInIndex(i, clsName, null,
+                                false);
                         if (c != null) {
                             return c;
                         }
+                    } catch (InvalidJarIndexException ex) {
+                        // Ignore misleading/wrong jar index
+                    }
+                } else {
+                    Class<?> c = (Class<?>) findInExtensions(explore(
+                            searchURLs[i], i), clsName, i, null, false);
+                    if (c != null) {
+                        return c;
                     }
                 }
             }
@@ -1166,10 +1163,9 @@
      * @param indexNumber
      *            int the index in extensions to consider
      * 
-     * @return URL[] the URLs of bundled extensions that have been found (i.e. the
-     *         URL of jar files in the class-path attribute), or null if none.
-     *         if an INDEX.LIST has been found, an empty array is
-     *         returned
+     * @return URL[] the URLs of bundled extensions that have been found (i.e.
+     *         the URL of jar files in the class-path attribute), or null if
+     *         none. if an INDEX.LIST has been found, an empty array is returned
      */
     URL[] explore(URL url, int indexNumber) {
         URL[] internal;

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java?view=diff&rev=489658&r1=489657&r2=489658
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java
Fri Dec 22 06:17:14 2006
@@ -45,6 +45,17 @@
         }
     }
 
+    public class URLClassLoaderExt extends URLClassLoader {
+
+        public URLClassLoaderExt(URL[] urls) {
+            super(urls);
+        }
+
+        public Class<?> findClass(String cl) throws ClassNotFoundException {
+            return super.findClass(cl);
+        }
+    }
+    
     URLClassLoader ucl;
 
     /**
@@ -291,6 +302,10 @@
                         + "/JarIndex/hyts_42.jar!/bpack/"));
         assertTrue("Resources not found (2)", resourcesFound);
         assertFalse("No more resources expected", en.hasMoreElements());
+       
+        // Regression test for HARMONY-2357.
+        URLClassLoaderExt cl = new URLClassLoaderExt(new URL[557]);    
+        cl.findClass("0");                                         
     }
 
     /**



Mime
View raw message