diff options
Diffstat (limited to 'java/src/IceInternal/TcpConnector.java')
| -rw-r--r-- | java/src/IceInternal/TcpConnector.java | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java index 3e524736f13..ae5d618be99 100644 --- a/java/src/IceInternal/TcpConnector.java +++ b/java/src/IceInternal/TcpConnector.java @@ -9,7 +9,7 @@ package IceInternal; -final class TcpConnector implements Connector, java.lang.Comparable +final class TcpConnector implements Connector { public Transceiver connect() @@ -83,18 +83,9 @@ final class TcpConnector implements Connector, java.lang.Comparable _hashCode = 5 * _hashCode + _connectionId.hashCode(); } - // - // Compare connectors for sorting purposes - // public boolean equals(java.lang.Object obj) { - return compareTo(obj) == 0; - } - - public int - compareTo(java.lang.Object obj) // From java.lang.Comparable - { TcpConnector p = null; try @@ -103,46 +94,27 @@ final class TcpConnector implements Connector, java.lang.Comparable } catch(ClassCastException ex) { - try - { - Connector c = (Connector)obj; - return type() < c.type() ? -1 : 1; - } - catch(ClassCastException ee) - { - assert(false); - } + return false; } if(this == p) { - return 0; + return true; } - if(_timeout < p._timeout) - { - return -1; - } - else if(p._timeout < _timeout) + if(_timeout != p._timeout) { - return 1; + return false; } if(!_connectionId.equals(p._connectionId)) { - return _connectionId.compareTo(p._connectionId); + return false; } - return Network.compareAddress(_addr, p._addr); + return Network.compareAddress(_addr, p._addr) == 0; } - protected synchronized void - finalize() - throws Throwable - { - super.finalize(); - } - private Instance _instance; private TraceLevels _traceLevels; private Ice.Logger _logger; |