Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.salome-platform.org/modules/gui
[modules/gui.git]
/
src
/
Session
/
SALOME_Session_Server.cxx
diff --git
a/src/Session/SALOME_Session_Server.cxx
b/src/Session/SALOME_Session_Server.cxx
index 65284c93d644cf0f2b84c1f852b844b010d9e782..c8b52cf4f4c4b7204bd83da04392f17d8ec3561e 100755
(executable)
--- a/
src/Session/SALOME_Session_Server.cxx
+++ b/
src/Session/SALOME_Session_Server.cxx
@@
-68,6
+68,8
@@
#include CORBA_SERVER_HEADER(SALOME_Session)
#include CORBA_SERVER_HEADER(SALOMEDS)
#include CORBA_SERVER_HEADER(SALOME_Session)
#include CORBA_SERVER_HEADER(SALOMEDS)
+#include <time.h>
+
#include <QDir>
#include <QFile>
#include <QApplication>
#include <QDir>
#include <QFile>
#include <QApplication>
@@
-647,18
+649,28
@@
int main( int argc, char **argv )
//PyRun_SimpleString("orb.destroy()");
// Destroy the ORB:
//PyRun_SimpleString("orb.destroy()");
// Destroy the ORB:
- MESSAGE("Explicitely destroying the ORB (hoping to kill omniORB threads ...)");
+ sleep(2);
+ //std::cout << "@@@@@ Explicitely destroying the ORB (hoping to kill omniORB threads ...)\n";
ORB_INIT * init = SINGLETON_<ORB_INIT>::Instance();
if (init)
init->explicit_destroy();
ORB_INIT * init = SINGLETON_<ORB_INIT>::Instance();
if (init)
init->explicit_destroy();
+ //std::cout << "@@@@@ ORB destroyed\n";
// After ORB destruction
// After ORB destruction
- PyGILState_Ensure();
if(Py_IsInitialized())
if(Py_IsInitialized())
- Py_Finalize();
+ {
+ PyGILState_Ensure();
+ //std::cout << "@@@@@ About to PyFinalize\n";
+ Py_Finalize();
+ //std::cout << "@@@@@ DONE PyFinalize\n";
+ }
if ( shutdownAll )
if ( shutdownAll )
- killOmniNames();
+ {
+ //std::cout << "@@@@@ About to kill omni\n";
+ killOmniNames();
+ //std::cout << "@@@@@ DONE kill omni\n";
+ }
MESSAGE( "Salome_Session_Server:endofserver" );
return result;
MESSAGE( "Salome_Session_Server:endofserver" );
return result;