diff options
Diffstat (limited to 'java/src/Glacier2/SessionFactoryHelper.java')
| -rw-r--r-- | java/src/Glacier2/SessionFactoryHelper.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/java/src/Glacier2/SessionFactoryHelper.java b/java/src/Glacier2/SessionFactoryHelper.java index d7761b797fa..9febb07f368 100644 --- a/java/src/Glacier2/SessionFactoryHelper.java +++ b/java/src/Glacier2/SessionFactoryHelper.java @@ -312,7 +312,12 @@ public class SessionFactoryHelper } initData.properties.setProperty("Ice.Default.Router", sb.toString()); - if(_secure) + // + // 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 + // configuration so it can be loaded from a custom location. + // + if(_secure && initData.properties.getProperty("Ice.Plugin.IceSSL").length() == 0) { initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory"); } |