[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath: Fixed File.list to return null in error case
Kaffe CVS
cvs-commits at kaffe.org
Sun Mar 7 08:42:02 PST 2004
PatchSet 4485
Date: 2004/03/07 16:28:23
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: Fixed File.list to return null in error case
2004-03-07 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath
2004-01-15 Michael Koch <konqueror at gmx.de>
* java/io/File.java
(list): Return null in error case.
Members:
ChangeLog:1.2065->1.2066
libraries/javalib/java/io/File.java:1.41->1.42
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2065 kaffe/ChangeLog:1.2066
--- kaffe/ChangeLog:1.2065 Sun Mar 7 15:01:11 2004
+++ kaffe/ChangeLog Sun Mar 7 16:28:23 2004
@@ -2,6 +2,15 @@
Resynced with GNU Classpath
+ 2004-01-15 Michael Koch <konqueror at gmx.de>
+
+ * java/io/File.java
+ (list): Return null in error case.
+
+2004-03-07 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath
+
2004-02-27 Michael Koch <konqueror at gmx.de>
* gnu/java/nio/FileLockImpl.java
Index: kaffe/libraries/javalib/java/io/File.java
diff -u kaffe/libraries/javalib/java/io/File.java:1.41 kaffe/libraries/javalib/java/io/File.java:1.42
--- kaffe/libraries/javalib/java/io/File.java:1.41 Wed Dec 31 09:14:20 2003
+++ kaffe/libraries/javalib/java/io/File.java Sun Mar 7 16:28:24 2004
@@ -694,8 +694,10 @@
String files[] = listInternal(list_path);
+ // Check if an error occured in listInternal().
if (files == null)
- return new String[0];
+ return null;
+
if (filter == null)
return files;
More information about the kaffe
mailing list