From d02b0603f1bd1b66b47673474bc167c65f619f93 Mon Sep 17 00:00:00 2001 From: Dwayne Boone Date: Fri, 9 Jan 2015 09:18:21 -0330 Subject: ICE-6196 Fixes for ProtocolInstance::secure() --- cpp/src/Ice/ProtocolInstance.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'cpp/src/Ice/ProtocolInstance.cpp') 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,32 +22,30 @@ 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 { -- cgit v1.2.3