* gnu/gcj/runtime/VMClassLoader.java (init): Add extensions

        directory only if it actually exists.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 965be17..2d0ec4b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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:

diff --git a/libjava/gnu/gcj/runtime/VMClassLoader.java b/libjava/gnu/gcj/runtime/VMClassLoader.java
index 75d193b..5e7f4c8 100644 (file)
--- a/libjava/gnu/gcj/runtime/VMClassLoader.java
+++ b/libjava/gnu/gcj/runtime/VMClassLoader.java
@@ -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)
          {