diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-04-26 18:37:38 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-26 18:37:38 +0200 |
commit | de59ae055c776b69a9552335f2ce9920ae1e7305 (patch) | |
tree | 2f2b3a439650fd1a2ccd8d9fe5264f8239f7ebe8 /java/src/IceInternal/TcpConnector.java | |
parent | Merge remote-tracking branch 'origin/master' into encoding11 (diff) | |
download | ice-de59ae055c776b69a9552335f2ce9920ae1e7305.tar.bz2 ice-de59ae055c776b69a9552335f2ce9920ae1e7305.tar.xz ice-de59ae055c776b69a9552335f2ce9920ae1e7305.zip |
Win32 fixes, C# port
Diffstat (limited to 'java/src/IceInternal/TcpConnector.java')
-rw-r--r-- | java/src/IceInternal/TcpConnector.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java index 22cb5ca5172..7947a4152f8 100644 --- a/java/src/IceInternal/TcpConnector.java +++ b/java/src/IceInternal/TcpConnector.java @@ -91,22 +91,17 @@ final class TcpConnector implements Connector public boolean equals(java.lang.Object obj) { - TcpConnector p = null; - - try - { - p = (TcpConnector)obj; - } - catch(ClassCastException ex) + if(!(obj instanceof TcpConnector)) { return false; } - if(this == p) + if(this == obj) { return true; } + TcpConnector p = (TcpConnector)obj; if(_timeout != p._timeout) { return false; |