diff options
Diffstat (limited to 'cpp/src/Ice/DefaultsAndOverrides.cpp')
| -rw-r--r-- | cpp/src/Ice/DefaultsAndOverrides.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp index 1f3a851b713..91ffcb59293 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -24,7 +24,9 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro overrideConnectTimeout(false), overrideConnectTimeoutValue(-1), overrideCompress(false), - overrideCompressValue(false) + overrideCompressValue(false), + overrideSecure(false), + overrideSecureValue(false) { const_cast<string&>(defaultProtocol) = properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp"); @@ -55,6 +57,13 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro const_cast<bool&>(overrideCompressValue) = properties->getPropertyAsInt("Ice.Override.Compress"); } + value = properties->getProperty("Ice.Override.Secure"); + if(!value.empty()) + { + const_cast<bool&>(overrideSecure) = true; + const_cast<bool&>(overrideSecureValue) = properties->getPropertyAsInt("Ice.Override.Secure"); + } + const_cast<string&>(defaultLocator) = properties->getProperty("Ice.Default.Locator"); const_cast<bool&>(defaultCollocationOptimization) = |