ICE-6196 Fixes for ProtocolInstance::secure()

1 files changed, 8 insertions, 10 deletions

diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp
index c7f17a3d9c3..a376873af05 100644
--- a/cpp/src/Ice/ProtocolInstance.cpp
+++ b/cpp/src/Ice/ProtocolInstance.cpp
@@ -22,33 +22,31 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(ProtocolInstance* p) { return p; }
 
-IceInternal::ProtocolInstance::ProtocolInstance(const CommunicatorPtr& com, Short type, const string& protocol) :
+IceInternal::ProtocolInstance::ProtocolInstance(const CommunicatorPtr& com, Short type, const string& protocol,
+                                                 bool secure) :
     _instance(getInstance(com)),
     _traceLevel(_instance->traceLevels()->network),
     _traceCategory(_instance->traceLevels()->networkCat),
     _properties(_instance->initializationData().properties),
     _protocol(protocol),
-    _type(type)
+    _type(type),
+    _secure(secure)
 {
 }
 
-IceInternal::ProtocolInstance::ProtocolInstance(const InstancePtr& instance, Short type, const string& protocol) :
+IceInternal::ProtocolInstance::ProtocolInstance(const InstancePtr& instance, Short type, const string& protocol,
+                                                bool secure) :
     _instance(instance),
     _traceLevel(_instance->traceLevels()->network),
     _traceCategory(_instance->traceLevels()->networkCat),
     _properties(_instance->initializationData().properties),
     _protocol(protocol),
-    _type(type)
+    _type(type),
+    _secure(secure)
 {
 }
 
 bool
-IceInternal::ProtocolInstance::secure() const
-{
-    return _type == IceSSL::EndpointType || _type == WSSEndpointType;
-}
-
-bool
 IceInternal::ProtocolInstance::preferIPv6() const
 {
     return _instance->preferIPv6();