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/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index 8c9857880fa..c881e5574f6 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -86,16 +86,6 @@ IceSSL::ConnectorI::operator==(const IceInternal::Connector& r) const
         return false;
     }
 
-    if(_protocol != p->_protocol)
-    {
-        return false;
-    }
-
-    if(_encoding != p->_encoding)
-    {
-        return false;
-    }
-
     if(_connectionId != p->_connectionId)
     {
         return false;
@@ -128,24 +118,6 @@ IceSSL::ConnectorI::operator<(const IceInternal::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;
@@ -159,15 +131,12 @@ IceSSL::ConnectorI::operator<(const IceInternal::Connector& r) const
 }
 
 IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const string& host, const struct sockaddr_storage& addr,
-                               Ice::Int timeout, const Ice::ProtocolVersion& protocol, 
-                               const Ice::EncodingVersion& encoding, const string& connectionId) :
+                               Ice::Int timeout, const string& connectionId) :
     _instance(instance),
     _logger(instance->communicator()->getLogger()),
     _host(host),
     _addr(addr),
     _timeout(timeout),
-    _protocol(protocol),
-    _encoding(encoding),
     _connectionId(connectionId)
 {
 }