diff options
| author | Jose <jose@zeroc.com> | 2012-06-25 18:57:43 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-06-25 18:57:43 +0200 |
| commit | b4ffc7bc488dde3b9dec7677ceba0746e327848e (patch) | |
| tree | 0154bb926baccfa361fb0cbe8be22d1701176930 | |
| parent | ICE-4838 - Glacier2::SessionCallback should use virtual inheritnace (diff) | |
| download | ice-b4ffc7bc488dde3b9dec7677ceba0746e327848e.tar.bz2 ice-b4ffc7bc488dde3b9dec7677ceba0746e327848e.tar.xz ice-b4ffc7bc488dde3b9dec7677ceba0746e327848e.zip | |
ICE-4839 - Glacier2 sessionHelper IceSSL plug-in
| -rw-r--r-- | cpp/src/Glacier2Lib/SessionHelper.cpp | 8 | ||||
| -rw-r--r-- | cs/src/Glacier2/SessionFactoryHelper.cs | 8 | ||||
| -rw-r--r-- | java/src/Glacier2/SessionFactoryHelper.java | 8 |
3 files changed, 12 insertions, 12 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"); - } } diff --git a/cs/src/Glacier2/SessionFactoryHelper.cs b/cs/src/Glacier2/SessionFactoryHelper.cs index a53146f3844..d168b6eafcc 100644 --- a/cs/src/Glacier2/SessionFactoryHelper.cs +++ b/cs/src/Glacier2/SessionFactoryHelper.cs @@ -322,6 +322,10 @@ public class SessionFactoryHelper sb.Append(_timeout); } initData.properties.setProperty("Ice.Default.Router", sb.ToString()); + if(_secure) + { + initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL:IceSSL.PluginFactory"); + } } return initData; } @@ -331,10 +335,6 @@ public class SessionFactoryHelper { _initData.properties.setProperty("Ice.ACM.Client", "0"); _initData.properties.setProperty("Ice.RetryIntervals", "-1"); - if(_secure) - { - _initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL:IceSSL.PluginFactory"); - } } private SessionCallback _callback; diff --git a/java/src/Glacier2/SessionFactoryHelper.java b/java/src/Glacier2/SessionFactoryHelper.java index ed5241751a7..e7526510f80 100644 --- a/java/src/Glacier2/SessionFactoryHelper.java +++ b/java/src/Glacier2/SessionFactoryHelper.java @@ -91,10 +91,6 @@ public class SessionFactoryHelper // _initData.properties.setProperty("Ice.ACM.Client", "0"); _initData.properties.setProperty("Ice.RetryIntervals", "-1"); - if(_secure) - { - _initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory"); - } } /** @@ -316,6 +312,10 @@ public class SessionFactoryHelper } initData.properties.setProperty("Ice.Default.Router", sb.toString()); + if(_secure) + { + initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory"); + } } return initData; } |