From 7d7f0215fbeeb0414119d08fbb30258fee128461 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 15 Mar 2012 06:51:08 +0000
Subject: [PATCH] Shutdown Session server (move it to the end of
 shutdownServers() to avoid problems with shutdowning embedded servers)

---
 src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index 4a80ac229..d09453f23 100644
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@ -550,7 +550,6 @@ void SALOME_LifeCycleCORBA::shutdownServers()
     if (!CORBA::is_nil(session))
     {
       pid = session->getPID();
-      session->Shutdown();
     }
   }
 
@@ -645,7 +644,19 @@ void SALOME_LifeCycleCORBA::shutdownServers()
        // ignore and continue
     }
 
-  // 6) Logger
+  // 6) Session
+  if ( !CORBA::is_nil( session ) ) {
+    try
+    {
+      session->Shutdown();
+    }
+    catch(const CORBA::Exception& e)
+    {
+      // ignore and continue
+    }
+  }
+
+  // 7) Logger
   int argc = 0;
   char *xargv = (char*)"";
   char **argv = &xargv;
-- 
2.39.2