diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-26 21:11:03 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-26 21:11:03 +0000 |
| commit | 7da61f803eca8e3b738a60e9a16f8b23c3b5586e (patch) | |
| tree | 2587f33dc97c6624cedb6ae8feaf93ea79d1aaf9 | |
| parent | d7f2ea78339334a1cefbae1c64f6d923328dce7d (diff) | |
| download | gcc-7da61f803eca8e3b738a60e9a16f8b23c3b5586e.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75039 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 d566535d8c1..fd7b37b6d64 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 4c599d11d1b..c88f83db445 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); } /** |