diff options
| author | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
| commit | 9e833a51504b14ac852863dcad59a51e6025ce79 (patch) | |
| tree | 6ca0297b6e6575fe4c6b2d48b606fef8132b9e5a /cpp/src/Glacier2Lib/SessionHelper.cpp | |
| parent | implementing optional params in Java (diff) | |
| parent | WinRT support (diff) | |
| download | ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.bz2 ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.xz ice-9e833a51504b14ac852863dcad59a51e6025ce79.zip | |
Merge branch 'master' into encoding11
Conflicts:
CHANGES
cpp/src/Ice/EndpointI.cpp
cpp/src/Ice/TcpConnector.cpp
cpp/src/Ice/TcpConnector.h
cpp/src/Ice/UdpConnector.cpp
cpp/src/Ice/UdpConnector.h
Diffstat (limited to 'cpp/src/Glacier2Lib/SessionHelper.cpp')
| -rw-r--r-- | cpp/src/Glacier2Lib/SessionHelper.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 0cc4ac43c97..801b4de1a5a 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -1004,6 +1004,12 @@ Glacier2::SessionFactoryHelper::createInitData() os << _timeout; } initData.properties->setProperty("Ice.Default.Router", os.str()); +#ifndef ICE_OS_WINRT + if(_secure) + { + initData.properties->setProperty("Ice.Plugin.IceSSL","IceSSL:createIceSSL"); + } +#endif } return initData; } @@ -1014,8 +1020,4 @@ Glacier2::SessionFactoryHelper::setDefaultProperties() assert(_initData.properties); _initData.properties->setProperty("Ice.ACM.Client", "0"); _initData.properties->setProperty("Ice.RetryIntervals", "-1"); - if(_secure) - { - _initData.properties->setProperty("Ice.Plugin.IceSSL","IceSSL:createIceSSL"); - } } |