From b4ac09cddb5a433147b996570258e8732a706a18 Mon Sep 17 00:00:00 2001 From: bryce Date: Sun, 30 Sep 2001 07:52:16 +0000 Subject: PR libgcj/4383 * gnu/gcj/protocol/file/Connection.java (connect): Throw FileNotFoundException if appropriate. * gnu/gcj/protocol/file/Handler.java (openConnection): Throw an IOException if we got a file: url with a hostname. Comment out protocol switch to ftp for now. * java/net/URL.java (URL): Include protocol name in exception message when handler can't be found. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45898 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/gcj/protocol/file/Connection.java | 6 +++++- libjava/gnu/gcj/protocol/file/Handler.java | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'libjava/gnu') diff --git a/libjava/gnu/gcj/protocol/file/Connection.java b/libjava/gnu/gcj/protocol/file/Connection.java index b7804cbea0c..e9ef08f2c30 100644 --- a/libjava/gnu/gcj/protocol/file/Connection.java +++ b/libjava/gnu/gcj/protocol/file/Connection.java @@ -48,7 +48,11 @@ class Connection extends URLConnection // If not connected, then file needs to be openned. fileIn = new File(url.getFile()); - connected = true; + + if (fileIn.exists()) + connected = true; + else + throw new FileNotFoundException("No such file or directory"); } public InputStream getInputStream() throws IOException diff --git a/libjava/gnu/gcj/protocol/file/Handler.java b/libjava/gnu/gcj/protocol/file/Handler.java index b4d8fbfbe42..f48ef8e9f31 100644 --- a/libjava/gnu/gcj/protocol/file/Handler.java +++ b/libjava/gnu/gcj/protocol/file/Handler.java @@ -35,6 +35,8 @@ public class Handler extends URLStreamHandler String host = url.getHost(); if ((host != null) && (! host.equals(""))) { + throw new IOException("ftp protocol handler not yet implemented."); + /* // Reset the protocol (and implicitly the handler) for this URL. // Then have the URL attempt the connection again, as it will // get the changed handler the next time around. @@ -43,6 +45,7 @@ public class Handler extends URLStreamHandler // Until the ftp protocol handler is written, this will cause // a NullPointerException. return url.openConnection(); + */ } return new Connection(url); -- cgit v1.2.3