[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: class loader fix

Kaffe CVS cvs-commits at kaffe.org
Tue Jan 18 06:13:01 PST 2005


PatchSet 5867 
Date: 2005/01/18 14:08:19
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: class loader fix

2005-01-18  Dalibor Topic  <robilad at kaffe.org>

Resynced with GNU Classpath.

2005-01-16  Mark Wielaard  <mark at klomp.org>

Reported by Christian Thalinger <twisti at complang.tuwien.ac.at>
* java/lang/ClassLoader.java (getExtClassLoaderUrls): Add check for
null returned from getFiles().

Members: 
	libraries/javalib/java/lang/ClassLoader.java:1.36->1.37 

Index: kaffe/libraries/javalib/java/lang/ClassLoader.java
diff -u kaffe/libraries/javalib/java/lang/ClassLoader.java:1.36 kaffe/libraries/javalib/java/lang/ClassLoader.java:1.37
--- kaffe/libraries/javalib/java/lang/ClassLoader.java:1.36	Fri Jan  7 18:59:39 2005
+++ kaffe/libraries/javalib/java/lang/ClassLoader.java	Tue Jan 18 14:08:19 2005
@@ -998,10 +998,9 @@
 	  {
 	    File f = new File(tok.nextToken());
 	    File[] files = f.listFiles();
-	    for (int i = 0; i < files.length; i++)
-	      {
+	    if (files != null)
+	      for (int i = 0; i < files.length; i++)
 		list.add(files[i].toURL());
-	      }
 	  }
 	catch(Exception x)
 	  {




More information about the kaffe mailing list