[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath: Removed unneded check in Jar handler

Kaffe CVS cvs-commits at kaffe.org
Sun Mar 7 07:24:02 PST 2004


PatchSet 4483 
Date: 2004/03/07 14:54:18
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: Removed unneded check in Jar handler

2004-03-07  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath

        2004-02-27  Michael Koch  <konqueror at gmx.de>

        * gnu/java/net/protocol/jar/Handler.java
        (): Removed unneeded check for file != null. java.net.URL.getFile()
        returns an empty string but never null.

Members: 
	ChangeLog:1.2063->1.2064 
	libraries/javalib/gnu/java/net/protocol/jar/Handler.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2063 kaffe/ChangeLog:1.2064
--- kaffe/ChangeLog:1.2063	Sun Mar  7 13:30:26 2004
+++ kaffe/ChangeLog	Sun Mar  7 14:54:18 2004
@@ -4,6 +4,16 @@
 
 	2004-02-27  Michael Koch  <konqueror at gmx.de>
 
+        * gnu/java/net/protocol/jar/Handler.java
+        (): Removed unneeded check for file != null. java.net.URL.getFile()
+        returns an empty string but never null.
+
+2004-03-07  Dalibor Topic <robilad at kaffe.org>
+
+        Resynced with GNU Classpath
+
+	2004-02-27  Michael Koch  <konqueror at gmx.de>
+
         * gnu/java/awt/ComponentDataBlitOp.java
         (INSTANCE): Made final.
 
Index: kaffe/libraries/javalib/gnu/java/net/protocol/jar/Handler.java
diff -u kaffe/libraries/javalib/gnu/java/net/protocol/jar/Handler.java:1.4 kaffe/libraries/javalib/gnu/java/net/protocol/jar/Handler.java:1.5
--- kaffe/libraries/javalib/gnu/java/net/protocol/jar/Handler.java:1.4	Sat Jan  3 01:51:06 2004
+++ kaffe/libraries/javalib/gnu/java/net/protocol/jar/Handler.java	Sun Mar  7 14:54:20 2004
@@ -86,8 +86,7 @@
     // doing anything.
     String file = url.getFile();
     
-    if (file != null
-        && file != "")
+    if (!file.equals(""))
       { //has context url
 	url_string = url_string.substring (start, end);
         if (url_string.startsWith("/"))




More information about the kaffe mailing list