yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proxy.java (equals): Handle case where address==null.

Browse Source 
* java/net/Proxy.java (equals): Handle case where address==null.
	(hashCode): Likewise.
	(toString): Likewise.

From-SVN: r121609
This commit is contained in:
Tom Tromey
2007-02-05 21:05:10 +00:00
committed by Tom Tromey
parent 072d019dfc
commit 9e006df67f
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/classpath/java/net/Proxy.java
+6 -4
View File
@@ -1,5 +1,5 @@
/* Proxy.java -- Represends a proxy for a network connection
Copyright (C) 2006 Free Software Foundation, Inc.
Copyright (C) 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -112,7 +112,8 @@ public class Proxy
Proxy tmp = (Proxy) obj;
return (type.equals(tmp.type)
&& address.equals(tmp.address));
&& (address == null ? tmp.address == null
: address.equals(tmp.address)));
}
/**
@@ -122,7 +123,7 @@ public class Proxy
*/
public final int hashCode()
{
return type.hashCode() ^ address.hashCode();
return type.hashCode() ^ (address == null ? 0 : address.hashCode());
}
/**
@@ -132,6 +133,7 @@ public class Proxy
*/
public String toString()
{
return type.toString() + ":" + address.toString();
return type.toString() + (address == null ? ""
: (":" + address.toString()));
}
}