[kaffe] CVS kaffe (dalibor): Fix to get Tomcat 4.1.27 to run

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Sun Sep 14 13:04:03 2003


PatchSet 4033 
Date: 2003/09/14 20:01:45
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fix to get Tomcat 4.1.27 to run

Tomcat loads without errors with this fix. In order to get JSPs to work,
one has to set kjc as the JSP compiler in tomcat's conf/web.xml. Works
best with lots of memory.

Members: 
	ChangeLog:1.1629->1.1630 
	libraries/javalib/java/net/URL.java:1.32->1.33 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1629 kaffe/ChangeLog:1.1630
--- kaffe/ChangeLog:1.1629	Sat Sep 13 22:32:00 2003
+++ kaffe/ChangeLog	Sun Sep 14 20:01:45 2003
@@ -1,3 +1,9 @@
+2003-09-14  Dalibor Topic <robilad@kaffe.org>,
+            Helmer Kraemer  <hkraemer@freenet.de>
+
+	* libraries/javalib/java/net/URL.java:
+	(URL) Don't explicitely throw NullPointerExceptions.
+	
 2003-09-13  Ito Kazumitsu <kaz@maczuka.gcd.org>
 
 	* libraries/javalib/gnu/xml/aelfred2/XmlParser.java:
Index: kaffe/libraries/javalib/java/net/URL.java
diff -u kaffe/libraries/javalib/java/net/URL.java:1.32 kaffe/libraries/javalib/java/net/URL.java:1.33
--- kaffe/libraries/javalib/java/net/URL.java:1.32	Sat Sep 13 12:30:48 2003
+++ kaffe/libraries/javalib/java/net/URL.java	Sun Sep 14 20:01:46 2003
@@ -47,11 +47,6 @@
 // Note special handling for "file:" that mirrors what JDK seems to do
 public URL(String protocol, String host, int port, String file,
 		URLStreamHandler handler) throws MalformedURLException {
-	if (protocol == null
-	    || (host == null && !protocol.equals("file"))
-	    || file == null) {
-		throw new NullPointerException();
-	}
 	if (protocol.equals("file") && host != null && host.length() != 0) {
 		setHandler("ftp", handler);
 	} else {