Handler.java (): Removed unneeded check for file != null.

2004-02-20  Michael Koch  <konqueror@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.

From-SVN: r78176

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6de22ee5b4495c75448d952ce48ee1afcef71522..6899b9200ce339eff9e2e475622405984bf64b1c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-20  Michael Koch  <konqueror@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-02-20  Michael Koch  <konqueror@gmx.de>
 
        * gnu/gcj/convert/Convert.java

diff --git a/libjava/gnu/java/net/protocol/jar/Handler.java b/libjava/gnu/java/net/protocol/jar/Handler.java
index d1235032c382cca3d6255df785c93c4d18305637..fc4223d46a34fc183ae4c549c2fedfc1cc22c318 100644 (file)
--- a/libjava/gnu/java/net/protocol/jar/Handler.java
+++ b/libjava/gnu/java/net/protocol/jar/Handler.java
@@ -86,8 +86,7 @@ public class Handler extends URLStreamHandler
     // 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("/"))