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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78176 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6de22ee..6899b92 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,11 @@
 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
        (main): Use equals() to compare strings.
 

diff --git a/libjava/gnu/java/net/protocol/jar/Handler.java b/libjava/gnu/java/net/protocol/jar/Handler.java
index d123503..fc4223d 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("/"))