Merge from V6_main 13/12/2012

[modules/gui.git] / src / Session / Session_ServerThread.cxx

diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx
index 07e1e6726991ae1569e77eb800ec2b6341532399..341231c87d35c47091de52838de4f5da92864073 100755 (executable)
--- a/src/Session/Session_ServerThread.cxx
+++ b/src/Session/Session_ServerThread.cxx
@@ -84,6 +84,7 @@ Session_ServerThread::Session_ServerThread(int argc,
   _servType =-1;
   _NS = new SALOME_NamingService(_orb); // one instance per server to limit
                                         // multi thread coherence problems
+  _container = 0;                       // embedded container
 }
 
 /*! 
@@ -165,6 +166,11 @@ void Session_ServerThread::Init()
   }
 }
 
+void Session_ServerThread::Shutdown()
+{
+  if ( _container ) _container->Shutdown();
+}
+
 void Session_ServerThread::ActivateModuleCatalog(int argc,
                                                  char ** argv)
 {
@@ -356,7 +362,7 @@ void Session_ServerThread::ActivateContainer(int argc,
       containerName = argv[1];
     }
     
-    new Engines_Container_i(_orb, _root_poa, containerName , argc , argv , true , false);
+    _container = new Engines_Container_i(_orb, _root_poa, containerName , argc , argv , true , false);
   }
   catch(CORBA::SystemException&) {
     INFOS("Caught CORBA::SystemException.");