diff options
| author | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
| commit | 9e833a51504b14ac852863dcad59a51e6025ce79 (patch) | |
| tree | 6ca0297b6e6575fe4c6b2d48b606fef8132b9e5a /java/src | |
| parent | implementing optional params in Java (diff) | |
| parent | WinRT support (diff) | |
| download | ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.bz2 ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.xz ice-9e833a51504b14ac852863dcad59a51e6025ce79.zip | |
Merge branch 'master' into encoding11
Conflicts:
CHANGES
cpp/src/Ice/EndpointI.cpp
cpp/src/Ice/TcpConnector.cpp
cpp/src/Ice/TcpConnector.h
cpp/src/Ice/UdpConnector.cpp
cpp/src/Ice/UdpConnector.h
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Glacier2/SessionFactoryHelper.java | 8 |
1 files changed, 4 insertions, 4 deletions
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; } |