From 0ece5b91a4aca9b7098ad69b2392d21df202a5ed Mon Sep 17 00:00:00 2001
From: secher <secher>
Date: Wed, 11 Jul 2007 13:14:20 +0000
Subject: [PATCH] try to quit Salome as clean as possible

---
 bin/appliskel/killCurrentPort                     | 2 +-
 src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx | 1 +
 src/ResourcesManager/SALOME_ResourcesManager.cxx  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/appliskel/killCurrentPort b/bin/appliskel/killCurrentPort
index e1eb19268..41b14866a 100755
--- a/bin/appliskel/killCurrentPort
+++ b/bin/appliskel/killCurrentPort
@@ -21,7 +21,7 @@ currentPort=`${KERNEL_ROOT_DIR}/bin/salome/NSparam.py port`
 echo $currentPort
 
 # --- kill current salome session
-
+${KERNEL_ROOT_DIR}/bin/salome/shutdownSalome.py
 ${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py $currentPort
 
 # --- delete config files
diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
index 8c501ccb7..735ff5b13 100644
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
@@ -173,6 +173,7 @@ int main(int argc,char **argv)
     INFOS("Caught CORBA::Exception.")
       }
 
+  END_OF( argv[0] );
   //  delete myThreadTrace;
   return 0;
 }
diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index e0b17b028..bec7fff69 100644
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -647,7 +647,7 @@ std::string SALOME_ResourcesManager::BuildCmdrunSalomeBatch(
   tempOutputFile << "  sleep 1" << endl ;
   tempOutputFile << "  ./runSession waitContainers.py $arglist" << endl ;
   tempOutputFile << "  ./runSession python ~/" << DirForTmpFiles << "/" << FileNameToExecute << ".py" << endl;
-  tempOutputFile << "  ./runSession shutdownSalome.py" << endl;
+  tempOutputFile << "  ./runSession killCurrentPort" << endl;
   tempOutputFile << "else" << endl ;
   tempOutputFile << "  sleep 1" << endl ;
   tempOutputFile << "  ./runSession waitNS.py" << endl ;
-- 
2.39.2