aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2004-02-20 17:19:03 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2004-02-20 17:19:03 +0000
commit821b56cbd610e045d66c9327fc259711f9fab5f1 (patch)
treeb96e21173cfcbdbe76fdb9704d1bfcc300f4863d
parentbad9373568a53e3fed35b06afce06cdee55181ca (diff)
downloadgcc-821b56cbd610e045d66c9327fc259711f9fab5f1.zip
gcc-821b56cbd610e045d66c9327fc259711f9fab5f1.tar.gz
gcc-821b56cbd610e045d66c9327fc259711f9fab5f1.tar.bz2
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
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/gnu/java/net/protocol/jar/Handler.java3
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6de22ee..6899b92 100644
--- 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
--- 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("/"))