FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

URLClassLoader.java (JarURLLoader.JarURLLoader): Don't look aside for "GCJLIBS" in directory where jarfiles are loaded.

Browse source 
* 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.

From-SVN: r95076
This commit is contained in:
Mark Wielaard 2005-02-15 22:08:40 +00:00 • committed by Mark Wielaard
parent affa5a3418
commit d9fdd0d60f
2 changed files with 41 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/ChangeLog
View file

@ -1,3 +1,11 @@
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> 2005-02-15 Mark Wielaard <mark@klomp.org>
* javax/net/ssl/SSLContext.java (getInstance): Add exception message * javax/net/ssl/SSLContext.java (getInstance): Add exception message

107
libjava/java/net/URLClassLoader.java
View file

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