From: Michael Koch <konqueror@gmx.de>
Date: Fri, 20 Feb 2004 17:19:03 +0000 (+0000)
Subject: Handler.java (): Removed unneeded check for file != null.
X-Git-Tag: releases/gcc-4.0.0~9959
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=821b56cbd610e045d66c9327fc259711f9fab5f1;p=thirdparty%2Fgcc.git

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 6de22ee5b449..6899b9200ce3 100644
--- 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 d1235032c382..fc4223d46a34 100644
--- 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("/"))