diff options
| author | Jose <jose@zeroc.com> | 2013-01-17 00:11:12 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-01-17 00:11:12 +0100 |
| commit | 06b68da1908dda3c4e65651df0909becee5f62b1 (patch) | |
| tree | db9f8dd3b97af7c6315c26bb3b35eb838a30cb1d /java | |
| parent | Fixed (ICE-5186) - DynamicLibrary loadEntryPoint problem (diff) | |
| download | ice-06b68da1908dda3c4e65651df0909becee5f62b1.tar.bz2 ice-06b68da1908dda3c4e65651df0909becee5f62b1.tar.xz ice-06b68da1908dda3c4e65651df0909becee5f62b1.zip | |
Fixed (ICE-5187) - Glacier2 SessionHelpers cannot load IceSSL plug-in from custom location
Diffstat (limited to '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"); } |