YACS in SSL mode

[modules/kernel.git] / src / Container / SALOME_ComponentPy.py

diff --git a/src/Container/SALOME_ComponentPy.py b/src/Container/SALOME_ComponentPy.py
index 2ddb033d7af515c424835b4063f3159dd9916d0b..635f7e87e4d9e671133ff416404dcebaa2d51097 100644 (file)
--- a/src/Container/SALOME_ComponentPy.py
+++ b/src/Container/SALOME_ComponentPy.py
@@ -41,6 +41,7 @@ import Engines, Engines__POA
 import Registry
 from Utils_Identity import *
 from SALOME_NamingServicePy import *
+from SALOME_Embedded_NamingService_ClientPy import SALOME_Embedded_NamingService_ClientPy
 from libNOTIFICATION import *
 
 from SALOME_utilities import *
@@ -296,12 +297,16 @@ class SALOME_ComponentPy_i(SALOME_ComponentPy_Gen_i):
     """
     def __init__ (self, orb, poa, contID, containerName, instanceName, interfaceName, notif=False):
         SALOME_ComponentPy_Gen_i.__init__(self, orb, poa, contID, containerName, instanceName, interfaceName, notif)
-        naming_service = SALOME_NamingServicePy_i(self._orb)
+        emb_ns = self._contId.get_embedded_NS_if_ssl()
+        if CORBA.is_nil(emb_ns):
+            self._naming_service = SALOME_NamingServicePy_i(self._orb)
+        else:
+            self._naming_service = SALOME_Embedded_NamingService_ClientPy(emb_ns)
         Component_path = self._containerName + "/" + self._instanceName
         MESSAGE(  'SALOME_ComponentPy_i Register' + str( Component_path ) )
-        naming_service.Register(self._compo_o, Component_path)
+        self._naming_service.Register(self._compo_o, Component_path)
         # Add componentinstance to registry
-        obj = naming_service.Resolve('/Registry')
+        obj = self._naming_service.Resolve('/Registry')
         if obj is None:
             MESSAGE(  "Registry Reference is invalid" )
         else: