Bug 2017

1 files changed, 17 insertions, 6 deletions

diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 0a0be250765..4b3c23bb4bf 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -359,6 +359,7 @@ Client::run(int argc, char* argv[])
         replica = opts.optArg("replica");
     }
 
+    Glacier2::RouterPrx router;
     AdminSessionPrx session;
     SessionKeepAliveThreadPtr keepAlive;
     int status = EXIT_SUCCESS;
@@ -367,7 +368,6 @@ Client::run(int argc, char* argv[])
         int timeout;
         if(communicator()->getDefaultRouter())
         {
-            Glacier2::RouterPrx router;
             try
             {
                 router = Glacier2::RouterPrx::checkedCast(communicator()->getDefaultRouter());
@@ -648,16 +648,20 @@ Client::run(int argc, char* argv[])
             keepAlive->getThreadControl().join();
         }
 
-        if(session)
+        try
         {
-            try
+            if(router)
             {
-                session->destroy();
+                router->destroySession();
             }
-            catch(const Ice::Exception&)
+            else
             {
+                session->destroy();
             }
         }
+        catch(const Ice::Exception&)
+        {
+        }
         throw;
     }
 
@@ -668,7 +672,14 @@ Client::run(int argc, char* argv[])
     {
         try
         {
-            session->destroy();
+            if(router)
+            {
+                router->destroySession();
+            }
+            else
+            {
+                session->destroy();
+            }
         }
         catch(const Ice::Exception&)
         {