summaryrefslogtreecommitdiff
path: root/java/src/Glacier2/SessionFactoryHelper.java
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2010-04-05 13:48:54 -0700
committerMark Spruiell <mes@zeroc.com>2010-04-05 13:48:54 -0700
commit0a847eb2add5d58da1f37bcfef636fb17ec6c7f8 (patch)
treee3eff74295d166383aac139e5c5d2cad6013c7b7 /java/src/Glacier2/SessionFactoryHelper.java
parentanother OpenSSL fix (diff)
downloadice-0a847eb2add5d58da1f37bcfef636fb17ec6c7f8.tar.bz2
ice-0a847eb2add5d58da1f37bcfef636fb17ec6c7f8.tar.xz
ice-0a847eb2add5d58da1f37bcfef636fb17ec6c7f8.zip
bug 4718 - Glacier2 helpers need to trap CommunicatorDestroyedException
Diffstat (limited to 'java/src/Glacier2/SessionFactoryHelper.java')
-rw-r--r--java/src/Glacier2/SessionFactoryHelper.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/java/src/Glacier2/SessionFactoryHelper.java b/java/src/Glacier2/SessionFactoryHelper.java
index 324e93e4046..37914ac5d00 100644
--- a/java/src/Glacier2/SessionFactoryHelper.java
+++ b/java/src/Glacier2/SessionFactoryHelper.java
@@ -26,7 +26,8 @@ public class SessionFactoryHelper
* @throws {@link Ice.InitializationException}
*/
public
- SessionFactoryHelper(SessionCallback callback) throws Ice.InitializationException
+ SessionFactoryHelper(SessionCallback callback)
+ throws Ice.InitializationException
{
initialize(callback, new Ice.InitializationData(), Ice.Util.createProperties());
}
@@ -39,7 +40,8 @@ public class SessionFactoryHelper
* @throws {@link Ice.InitializationException}
*/
public
- SessionFactoryHelper(Ice.InitializationData initData, SessionCallback callback) throws Ice.InitializationException
+ SessionFactoryHelper(Ice.InitializationData initData, SessionCallback callback)
+ throws Ice.InitializationException
{
initialize(callback, initData, initData.properties);
}
@@ -52,7 +54,8 @@ public class SessionFactoryHelper
* @throws {@link Ice.InitializationException}
*/
public
- SessionFactoryHelper(Ice.Properties properties, SessionCallback callback) throws Ice.InitializationException
+ SessionFactoryHelper(Ice.Properties properties, SessionCallback callback)
+ throws Ice.InitializationException
{
initialize(callback, new Ice.InitializationData(), properties);
}
@@ -63,8 +66,8 @@ public class SessionFactoryHelper
{
if(callback == null)
{
- throw new Ice.InitializationException("Attempt to create a SessionFactoryHelper with a null SessionCallback" +
- "argument");
+ throw new Ice.InitializationException("Attempt to create a SessionFactoryHelper with a null " +
+ "SessionCallback argument");
}
if(initData == null)
@@ -250,7 +253,9 @@ public class SessionFactoryHelper
private Ice.InitializationData
createInitData()
{
+ //
// Clone the initialization data and properties.
+ //
Ice.InitializationData initData = (Ice.InitializationData)_initData.clone();
initData.properties = initData.properties._clone();