diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-11 18:22:09 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-11 18:22:09 +0000 |
| commit | 3e38401205b9ce29b86b1a8606095adabd35b585 (patch) | |
| tree | 3b860ef7c7b10bd3123183217455386411e1a248 /libjava/java/net/URLStreamHandler.java | |
| parent | a0f7343c29c1b9c563a063af23e90798219daf2c (diff) | |
| download | gcc-3e38401205b9ce29b86b1a8606095adabd35b585.tar.gz | |
2004-02-11 Michael Koch <konqueror@gmx.de>
* java/net/DatagramSocket.java
(setReuseAddress): Use Boolean.valueOf() instead of creating a new
Boolean object.
(setBroadcast): Likewise.
* java/net/MulticastSocket.java
(setLoopbackMode): Likewise.
* java/net/ServerSocket.java
(setReuseAddress): Likewise.
* java/net/Socket.java
(setTcpNoDelay): Likewise.
(setSoLinger): Likewise.
(setOOBInline): Likewise.
(setKeepAlive): Likewise.
(setReuseAddress): Likewise.
* java/net/URLConnection.java
(setContentHandler): Replace == with equals().
* java/net/URLStreamHandler.java
(hostSEquals): Fix checking host addresses.
(toExternalForm): Dont check protocol for null. We know already its
not null.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77670 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/net/URLStreamHandler.java')
| -rw-r--r-- | libjava/java/net/URLStreamHandler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java index ec251297453..af4335f4f44 100644 --- a/libjava/java/net/URLStreamHandler.java +++ b/libjava/java/net/URLStreamHandler.java @@ -415,7 +415,7 @@ public abstract class URLStreamHandler InetAddress addr1 = getHostAddress (url1); InetAddress addr2 = getHostAddress (url2); - if (addr1 != null || addr2 != null) + if (addr1 != null && addr2 != null) return addr1.equals (addr2); String host1 = url1.getHost(); @@ -511,7 +511,7 @@ public abstract class URLStreamHandler int size = protocol.length() + host.length() + file.length() + 24; StringBuffer sb = new StringBuffer(size); - if (protocol != null && protocol.length() > 0) + if (protocol.length() != 0) { sb.append(protocol); sb.append(":"); |