Java port

1 files changed, 18 insertions, 1 deletions

diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java
index e0c4139215b..bb993442932 100644
--- a/java/src/IceInternal/TcpConnector.java
+++ b/java/src/IceInternal/TcpConnector.java
@@ -68,18 +68,23 @@ final class TcpConnector implements Connector
     //
     // Only for use by TcpEndpoint
     //
-    TcpConnector(Instance instance, java.net.InetSocketAddress addr, int timeout, String connectionId)
+    TcpConnector(Instance instance, java.net.InetSocketAddress addr, int timeout, Ice.ProtocolVersion protocol,
+                 Ice.EncodingVersion encoding, String connectionId)
     {
         _instance = instance;
         _traceLevels = instance.traceLevels();
         _logger = instance.initializationData().logger;
         _addr = addr;
         _timeout = timeout;
+        _protocol = protocol;
+        _encoding = encoding;
         _connectionId = connectionId;
 
         _hashCode = _addr.getAddress().getHostAddress().hashCode();
         _hashCode = 5 * _hashCode + _addr.getPort();
         _hashCode = 5 * _hashCode + _timeout;
+        _hashCode = 5 * _hashCode + _protocol.hashCode();
+        _hashCode = 5 * _hashCode + _encoding.hashCode();
         _hashCode = 5 * _hashCode + _connectionId.hashCode();
     }
 
@@ -107,6 +112,16 @@ final class TcpConnector implements Connector
             return false;
         }
 
+        if(!_protocol.equals(p._protocol))
+        {
+            return false;
+        }
+
+        if(!_encoding.equals(p._encoding))
+        {
+            return false;
+        }
+
         if(!_connectionId.equals(p._connectionId))
         {
             return false;
@@ -120,6 +135,8 @@ final class TcpConnector implements Connector
     private Ice.Logger _logger;
     private java.net.InetSocketAddress _addr;
     private int _timeout;
+    private Ice.ProtocolVersion _protocol;
+    private Ice.EncodingVersion _encoding;
     private String _connectionId = "";
     private int _hashCode;
 }