From: Michael Koch <konqueror@gmx.de>
Date: Wed, 15 Sep 2004 12:38:46 +0000 (+0000)
Subject: 2004-09-15  Michael Koch  <konqueror@gmx.de>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c36992ffc805eb5ca8c32cb83dd9dc9b1e1a2142;p=gcc.git

2004-09-15  Michael Koch  <konqueror@gmx.de>

	* gnu/java/net/protocol/file/Handler.java
	(openConnection): Don't throw exception if host part for file: URI is
	present. setURL() keeps file: protocol if ftp: protocol is not
	available.

From-SVN: r87546
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2a3039e6e8d..f3c973a64f4 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-15  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/net/protocol/file/Handler.java
+	(openConnection): Don't throw exception if host part for file: URI is
+	present. setURL() keeps file: protocol if ftp: protocol is not
+	available.
+
 2004-09-14  Richard Henderson  <rth@redhat.com>
 
 	* java/lang/natPosixProcess.cc (waitForSignal): Ignore return
diff --git a/libjava/gnu/java/net/protocol/file/Handler.java b/libjava/gnu/java/net/protocol/file/Handler.java
index 4f5fba3a5b4..18f91720e5f 100644
--- a/libjava/gnu/java/net/protocol/file/Handler.java
+++ b/libjava/gnu/java/net/protocol/file/Handler.java
@@ -1,5 +1,5 @@
 /* Handler.java -- "file" protocol handler for java.net
-   Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -76,17 +76,14 @@ 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.
+	// If the ftp protocol handler is not installed, an 
+	// exception will be thrown from the new openConnection() call.
 	setURL (url, "ftp", url.getHost(), url.getPort(), url.getFile(),
-		url.getRef());
-	// Until the ftp protocol handler is written, this will cause
-	// a NullPointerException.
+	        url.getRef());
 	return url.openConnection();
-	*/
       }
 
     return new Connection(url);