From: vsr <vsr@opencascade.com>
Date: Tue, 19 Feb 2008 14:54:10 +0000 (+0000)
Subject: Patch from Paul RASCLE: avoid CORBA exception on Session server exiting
X-Git-Tag: V4_1_1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3bf53d7530674f0023b04bec73a486e2a5484a10;p=modules%2Fgui.git

Patch from Paul RASCLE: avoid CORBA exception on Session server exiting
---

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index 37823d43a..ed3c28d06 100755
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -687,10 +687,8 @@ int main( int argc, char **argv )
   // unlock Session mutex
   _SessionMutex.unlock();
   
-  if ( shutdown ) {
+  if ( shutdown )
     shutdownServers( _NS );
-    killOmniNames();
-  }
 
   if ( myServerLauncher )
     myServerLauncher->KillAll(); // kill embedded servers
@@ -712,8 +710,8 @@ int main( int argc, char **argv )
       std::cerr << "Caught unexpected exception on destroy : ignored !!" << std::endl;
     }
 
-  //  if ( shutdown )
-  //    killOmniNames();
+  if ( shutdown )
+    killOmniNames();
 
   return result;
 }