Merge from agr_portmanager_branch_131004 03/12/2013

[modules/kernel.git] / bin / killSalomeWithPort.py

diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py
index acc541c2db19660f7ea640724e8311a796e3e060..71dd451736d1ac088a003ae7f0a211eff0868b5c 100755 (executable)
--- a/bin/killSalomeWithPort.py
+++ b/bin/killSalomeWithPort.py
@@ -141,6 +141,12 @@ def shutdownMyPort(port, cleanup=True):
     """
     if not port: return
 
+    try:
+        from PortManager import releasePort
+        releasePort(port)
+    except ImportError:
+        pass
+
     from salome_utils import generateFileName
 
     # set OMNIORB_CONFIG variable to the proper file
@@ -148,6 +154,8 @@ def shutdownMyPort(port, cleanup=True):
     kwargs = {}
     if omniorbUserPath is not None:
         kwargs["with_username"]=True
+    else:
+        omniorbUserPath = os.path.realpath(os.path.expanduser('~'))
     omniorb_config = generateFileName(omniorbUserPath, prefix="omniORB",
                                       extension="cfg",
                                       hidden=True,
@@ -184,6 +192,12 @@ def killMyPort(port):
     Parameters:
     - port - port number
     """
+    try:
+        import PortManager
+        PortManager.releasePort(port)
+    except ImportError:
+        pass
+
     from salome_utils import getShortHostName, getHostName
 
     # try to shutdown session nomally