From 821c7f44127a0d2509bb7b9ce771da3eab57a347 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Tue, 13 Nov 2012 11:38:05 +0000
Subject: [PATCH] 0021688: [CEA 572] Issue when using runSalome -k -t

---
 bin/killSalomeWithPort.py | 10 +++++++---
 bin/shutdownSalome.py     | 11 +++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py
index be71c654b..e4ba1d3c3 100755
--- a/bin/killSalomeWithPort.py
+++ b/bin/killSalomeWithPort.py
@@ -162,18 +162,22 @@ def shutdownMyPort(port):
                                       with_port=port,
                                       **kwargs)
     os.environ['OMNIORB_CONFIG'] = omniorb_config
+    os.environ['NSPORT'] = port
 
     # give the chance to the servers to shutdown properly
     try:
         import time
-        import salome_kernel
-        orb, lcc, naming_service, cm = salome_kernel.salome_kernel_init()
+        from omniORB import CORBA
+        from LifeCycleCORBA import LifeCycleCORBA
         # shutdown all
+        orb = CORBA.ORB_init([''], CORBA.ORB_ID)
+        lcc = LifeCycleCORBA(orb)
         lcc.shutdownServers()
         # give some time to shutdown to complete
         time.sleep(1)
         # shutdown omniNames and notifd
-        salome_kernel.LifeCycleCORBA.killOmniNames()
+        lcc.killOmniNames()
+        time.sleep(1)
     except:
         pass
     pass
diff --git a/bin/shutdownSalome.py b/bin/shutdownSalome.py
index b7d319696..ed81e00e8 100755
--- a/bin/shutdownSalome.py
+++ b/bin/shutdownSalome.py
@@ -27,9 +27,12 @@
 #
 
 import time
-import salome_kernel
-orb, lcc, naming_service, cm = salome_kernel.salome_kernel_init()
+from omniORB import CORBA
+from LifeCycleCORBA import *
+
+orb = CORBA.ORB_init([''], CORBA.ORB_ID)
+lcc = LifeCycleCORBA(orb)
 lcc.shutdownServers()
-#give some time to shutdown to complete
 time.sleep(1)
-salome_kernel.LifeCycleCORBA.killOmniNames()
+LifeCycleCORBA.killOmniNames()
+time.sleep(1)
-- 
2.39.2