summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/src/Glacier2Lib/SessionHelper.cpp4
-rw-r--r--csharp/src/Glacier2/SessionHelper.cs4
-rw-r--r--java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java4
-rw-r--r--java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java5
4 files changed, 9 insertions, 8 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index cd11cc19e99..4a3f384a2cb 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -583,10 +583,10 @@ public:
{
if(!communicator->getDefaultRouter())
{
+ Ice::RouterFinderPrxPtr finder;
try
{
- Ice::RouterFinderPrxPtr finder =
- ICE_UNCHECKED_CAST(Ice::RouterFinderPrx, communicator->stringToProxy(_finder));
+ finder = ICE_UNCHECKED_CAST(Ice::RouterFinderPrx, communicator->stringToProxy(_finder));
communicator->setDefaultRouter(finder->getRouter());
}
catch(const Ice::CommunicatorDestroyedException& ex)
diff --git a/csharp/src/Glacier2/SessionHelper.cs b/csharp/src/Glacier2/SessionHelper.cs
index b55107fb629..b6e0e20c751 100644
--- a/csharp/src/Glacier2/SessionHelper.cs
+++ b/csharp/src/Glacier2/SessionHelper.cs
@@ -389,10 +389,10 @@ public class SessionHelper
if(_communicator.getDefaultRouter() == null)
{
+ Ice.RouterFinderPrx finder = null;
try
{
- Ice.RouterFinderPrx finder =
- Ice.RouterFinderPrxHelper.uncheckedCast(_communicator.stringToProxy(_finderStr));
+ finder = Ice.RouterFinderPrxHelper.uncheckedCast(_communicator.stringToProxy(_finderStr));
_communicator.setDefaultRouter(finder.getRouter());
}
catch(Ice.CommunicatorDestroyedException ex)
diff --git a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
index f36690997f5..2d34cee2e18 100644
--- a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
+++ b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
@@ -453,10 +453,10 @@ public class SessionHelper
if(_communicator.getDefaultRouter() == null)
{
+ Ice.RouterFinderPrx finder = null;
try
{
- final Ice.RouterFinderPrx finder =
- Ice.RouterFinderPrxHelper.uncheckedCast(_communicator.stringToProxy(_finderStr));
+ finder = Ice.RouterFinderPrxHelper.uncheckedCast(_communicator.stringToProxy(_finderStr));
_communicator.setDefaultRouter(finder.getRouter());
}
catch(final Ice.CommunicatorDestroyedException ex)
diff --git a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java
index c3b3bf9cf16..3e99664322c 100644
--- a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java
+++ b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java
@@ -391,10 +391,11 @@ public class SessionHelper
}
if(_communicator.getDefaultRouter() == null)
{
+ com.zeroc.Ice.RouterFinderPrx finder = null;
try
{
- final com.zeroc.Ice.RouterFinderPrx finder =
- com.zeroc.Ice.RouterFinderPrx.uncheckedCast(_communicator.stringToProxy(_finderStr));
+ finder = com.zeroc.Ice.RouterFinderPrx.uncheckedCast(
+ _communicator.stringToProxy(_finderStr));
_communicator.setDefaultRouter(finder.getRouter());
}
catch(final com.zeroc.Ice.CommunicatorDestroyedException ex)