VMClassLoader.java (init): Add extensions directory only if it actually exists.

* gnu/gcj/runtime/VMClassLoader.java (init): Add extensions
        directory only if it actually exists.

From-SVN: r83347
This commit is contained in:
Ranjit Mathew 2004-06-18 13:53:19 +00:00 committed by Ranjit Mathew
parent a80e0e831f
commit 6ca77e6fa4
2 changed files with 21 additions and 13 deletions

View File

@ -1,3 +1,8 @@
2004-06-18 Ranjit Mathew <rmathew@hotmail.com>
* gnu/gcj/runtime/VMClassLoader.java (init): Add extensions
directory only if it actually exists.
2004-06-18 Graydon Hoare <graydon@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:

View File

@ -67,19 +67,22 @@ public final class VMClassLoader extends java.net.URLClassLoader
try
{
File dir = new File (dirname);
if (! dirname.endsWith (File.separator))
dirname = dirname + File.separator;
String files[]
= dir.list (new FilenameFilter ()
{
public boolean accept (File dir, String name)
{
return (name.endsWith (".jar")
|| name.endsWith (".zip"));
}
});
for (int i = files.length - 1; i >= 0; i--)
addURL(new URL("file", "", -1, dirname + files[i]));
if (dir.exists ())
{
if (! dirname.endsWith (File.separator))
dirname = dirname + File.separator;
String files[]
= dir.list (new FilenameFilter ()
{
public boolean accept (File dir, String name)
{
return (name.endsWith (".jar")
|| name.endsWith (".zip"));
}
});
for (int i = files.length - 1; i >= 0; i--)
addURL(new URL("file", "", -1, dirname + files[i]));
}
}
catch (Exception x)
{