diff options
Diffstat (limited to 'cpp/src/Glacier2Lib/SessionHelper.cpp')
| -rw-r--r-- | cpp/src/Glacier2Lib/SessionHelper.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 4a3f384a2cb..8f154f7fc93 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -583,10 +583,10 @@ public: { if(!communicator->getDefaultRouter()) { - Ice::RouterFinderPrxPtr finder; + Ice::RouterFinderPrxPtr finder = + ICE_UNCHECKED_CAST(Ice::RouterFinderPrx, communicator->stringToProxy(_finder)); try { - finder = ICE_UNCHECKED_CAST(Ice::RouterFinderPrx, communicator->stringToProxy(_finder)); communicator->setDefaultRouter(finder->getRouter()); } catch(const Ice::CommunicatorDestroyedException& ex) @@ -1158,7 +1158,6 @@ Glacier2::SessionFactoryHelper::createInitData() initData.properties->setProperty("Ice.Default.Router", createProxyStr(_identity)); } -#ifndef ICE_OS_UWP // // If using a secure connection setup the IceSSL plug-in, if IceSSL // plug-in has already been setup we don't want to override the @@ -1169,8 +1168,6 @@ Glacier2::SessionFactoryHelper::createInitData() { initData.properties->setProperty("Ice.Plugin.IceSSL","IceSSL:createIceSSL"); } -#endif - return initData; } |