Fixed ICE-4927: fixed proxy encoding to marshal protocol/encoding version instead of encoding it in endpoints

1 files changed, 1 insertions, 32 deletions

diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index a3211c28eb7..7c4dedb9cf2 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -77,16 +77,6 @@ IceInternal::TcpConnector::operator==(const Connector& r) const
         return false;
     }
 
-    if(_protocol != p->_protocol)
-    {
-        return false;
-    }
-
-    if(_encoding != p->_encoding)
-    {
-        return false;
-    }
-
     if(_connectionId != p->_connectionId)
     {
         return false;
@@ -119,24 +109,6 @@ IceInternal::TcpConnector::operator<(const Connector& r) const
         return false;
     }
 
-    if(_protocol < p->_protocol)
-    {
-        return true;
-    }
-    else if(p->_protocol < _protocol)
-    {
-        return false;
-    }
-
-    if(_encoding < p->_encoding)
-    {
-        return true;
-    }
-    else if(p->_encoding < _encoding)
-    {
-        return false;
-    }
-
     if(_connectionId < p->_connectionId)
     {
         return true;
@@ -149,15 +121,12 @@ IceInternal::TcpConnector::operator<(const Connector& r) const
 }
 
 IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const Address& addr,
-                                        Ice::Int timeout, const Ice::ProtocolVersion& protocol, 
-                                        const Ice::EncodingVersion& encoding, const string& connectionId) :
+                                        Ice::Int timeout, const string& connectionId) :
     _instance(instance),
     _traceLevels(instance->traceLevels()),
     _logger(instance->initializationData().logger),
     _addr(addr),
     _timeout(timeout),
-    _protocol(protocol),
-    _encoding(encoding),
     _connectionId(connectionId)
 {
 }