From: vsr <vsr@opencascade.com>
Date: Thu, 15 Mar 2012 06:51:08 +0000 (+0000)
Subject: Shutdown Session server (move it to the end of shutdownServers() to avoid problems... 
X-Git-Tag: V6_5_0a1~33
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7d7f0215fbeeb0414119d08fbb30258fee128461;p=modules%2Fkernel.git

Shutdown Session server (move it to the end of shutdownServers() to avoid problems with shutdowning embedded servers)
---

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;