diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/io/FileInputStream.java | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d566535..fd7b37b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-12-26 Guilhem Lavaux <guilhem@kaffe.org> + + * java/io/FileInputStream.java + (FileInputStream(String)): Call FileInputStream(File). + (FileInputStream(File)): Check whether the argument is a directory. + 2003-12-26 Michael Koch <konqueror@gmx.de> * Makefile.am (rmi_java_source_files): diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java index 4c599d1..c88f83d 100644 --- a/libjava/java/io/FileInputStream.java +++ b/libjava/java/io/FileInputStream.java @@ -79,11 +79,7 @@ public class FileInputStream extends InputStream */ public FileInputStream(String name) throws FileNotFoundException { - SecurityManager s = System.getSecurityManager(); - if (s != null) - s.checkRead(name); - - fd = new FileDescriptor(name, FileDescriptor.READ); + this(new File(name)); } /** @@ -104,7 +100,14 @@ public class FileInputStream extends InputStream */ public FileInputStream(File file) throws FileNotFoundException { - this(file.getPath()); + SecurityManager s = System.getSecurityManager(); + if (s != null) + s.checkRead(file.getPath()); + + if (file.isDirectory()) + throw new FileNotFoundException(file.getPath() + " is a directory"); + + fd = new FileDescriptor(file.getPath(), FileDescriptor.READ); } /** |