summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-06-25 18:57:43 +0200
committerJose <jose@zeroc.com>2012-06-25 18:57:43 +0200
commitb4ffc7bc488dde3b9dec7677ceba0746e327848e (patch)
tree0154bb926baccfa361fb0cbe8be22d1701176930 /cpp
parentICE-4838 - Glacier2::SessionCallback should use virtual inheritnace (diff)
downloadice-b4ffc7bc488dde3b9dec7677ceba0746e327848e.tar.bz2
ice-b4ffc7bc488dde3b9dec7677ceba0746e327848e.tar.xz
ice-b4ffc7bc488dde3b9dec7677ceba0746e327848e.zip
ICE-4839 - Glacier2 sessionHelper IceSSL plug-in
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Glacier2Lib/SessionHelper.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 0cc4ac43c97..861543e2c49 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -1004,6 +1004,10 @@ Glacier2::SessionFactoryHelper::createInitData()
os << _timeout;
}
initData.properties->setProperty("Ice.Default.Router", os.str());
+ if(_secure)
+ {
+ initData.properties->setProperty("Ice.Plugin.IceSSL","IceSSL:createIceSSL");
+ }
}
return initData;
}
@@ -1014,8 +1018,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");
- }
}