* java/net/URLClassLoader.java (JarURLLoader.JarURLLoader): Don't look

       aside for "GCJLIBS" in directory where jarfiles are loaded.
       (JarURLLoader.getClass): Removed method.
       (JarURLLoader.toString): Removed method.
       (FileResource.toString): Removed method.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95076 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0453d4e..e721f3e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,4 +1,12 @@
 2005-02-15  Mark Wielaard  <mark@klomp.org>
+
+       * java/net/URLClassLoader.java (JarURLLoader.JarURLLoader): Don't look
+       aside for "GCJLIBS" in directory where jarfiles are loaded.
+       (JarURLLoader.getClass): Removed method.
+       (JarURLLoader.toString): Removed method.
+       (FileResource.toString): Removed method.
+
+2005-02-15  Mark Wielaard  <mark@klomp.org>
  
        * javax/net/ssl/SSLContext.java (getInstance): Add exception message
        and/or cause before throwing.

diff --git a/libjava/java/net/URLClassLoader.java b/libjava/java/net/URLClassLoader.java
index 0da6a03..268b0b4 100644 (file)
--- a/libjava/java/net/URLClassLoader.java
+++ b/libjava/java/net/URLClassLoader.java
@@ -306,8 +306,6 @@ public class URLClassLoader extends SecureClassLoader
 
     Vector classPath;  // The "Class-Path" attribute of this Jar's manifest
 
-    SoURLLoader soURLLoader;
-
     public JarURLLoader(URLClassLoader classloader, URL baseURL)
     {
       super(classloader, baseURL);
@@ -320,70 +318,48 @@ public class URLClassLoader extends SecureClassLoader
       sb.append("!/");
       String jarURL = sb.toString();
 
-      this.soURLLoader = null;
       this.classPath = null;
       URL baseJarURL = null;
       JarFile jarfile = null;
       try
        {
-         baseJarURL
-           = new URL(null, jarURL, classloader.getURLStreamHandler("jar"));
-         jarfile
-           = ((JarURLConnection) baseJarURL.openConnection()).getJarFile();
-
-         if (jarfile != null)
+         baseJarURL =
+           new URL(null, jarURL, classloader.getURLStreamHandler("jar"));
+         
+         jarfile =
+           ((JarURLConnection) baseJarURL.openConnection()).getJarFile();
+         
+         Manifest manifest;
+         Attributes attributes;
+         String classPathString;
+         
+         if ((manifest = jarfile.getManifest()) != null
+             && (attributes = manifest.getMainAttributes()) != null
+             && ((classPathString 
+                  = attributes.getValue(Attributes.Name.CLASS_PATH)) 
+                 != null))
            {
-             String fileName = baseURL.getFile();
-             if (fileName != null)
-               {
-                 File f = new File(fileName);
-                 String libDirName = f.getCanonicalFile().getParent()
-                   + File.separator + "GCJLIBS";
-                 File libDir = new File(libDirName);
-                 if (libDir != null && (libDir.isDirectory()))
+             this.classPath = new Vector();
+             
+             StringTokenizer st
+               = new StringTokenizer 
+               (classPathString,
+                System.getProperty ("path.separator", ":"));
+             
+             while (st.hasMoreElements ()) 
+               {  
+                 String e = st.nextToken ();
+                 try
                    {
-                     File soFile = new File (libDirName 
-                                             + File.separator + f.getName() 
-                                             + ".so");
-                     if (soFile != null && soFile.isFile())
-                       this.soURLLoader
-                         = new SoURLLoader (classloader, soFile.toURL(),
-                                            baseURL);
-                   }
-               }
-
-             Manifest manifest;
-             Attributes attributes;
-             String classPathString;
-
-             if ((manifest = jarfile.getManifest()) != null
-                 && (attributes = manifest.getMainAttributes()) != null
-                 && ((classPathString 
-                      = attributes.getValue(Attributes.Name.CLASS_PATH)) 
-                     != null))
-               {
-                 this.classPath = new Vector();
-
-                 StringTokenizer st
-                   = new StringTokenizer 
-                     (classPathString,
-                      System.getProperty ("path.separator", ":"));
-      
-                 while (st.hasMoreElements ()) 
-                   {  
-                     String e = st.nextToken ();
-                     try
-                       {
-                         URL url = new URL(baseURL, e);
-                         this.classPath.add(url);
-                       } 
-                     catch (java.net.MalformedURLException xx)
-                       {
-                         // Give up
-                       }
+                     URL url = new URL(baseURL, e);
+                     this.classPath.add(url);
+                   } 
+                 catch (java.net.MalformedURLException xx)
+                   {
+                     // Give up
                    }
                }
-           }
+           }
        }
       catch (IOException ioe)
         {
@@ -394,13 +370,6 @@ public class URLClassLoader extends SecureClassLoader
       this.jarfile = jarfile;
     }
 
-    Class getClass(String className)
-    {
-      if (soURLLoader != null)
-       return soURLLoader.getClass(className);
-      return null;
-    }
-
     /** get resource with the name "name" in the jar url */
     Resource getResource(String name)
     {
@@ -417,11 +386,6 @@ public class URLClassLoader extends SecureClassLoader
         return null;
     }
 
-    public String toString ()
-    {
-       return "jarfile " + jarfile.getName();
-    }
-
     Manifest getManifest()
     {
       try
@@ -672,11 +636,6 @@ public class URLClassLoader extends SecureClassLoader
       return (int) file.length();
     }
 
-    public String toString ()
-    {
-       return "file " +file.getAbsolutePath();
-    }
-
     public URL getURL()
     {
       try