[tuleap29134] : fix pvsimple import in SSL mode

[modules/gui.git] / src / PVServerService / ENGINE / PVSERVER_utils.py

diff --git a/src/PVServerService/ENGINE/PVSERVER_utils.py b/src/PVServerService/ENGINE/PVSERVER_utils.py
index a414db75aa108a4ecaceb447baf5b4e11c00208e..fd078177b222e0f518a0acb0de0d9fd1b553348f 100644 (file)
--- a/src/PVServerService/ENGINE/PVSERVER_utils.py
+++ b/src/PVServerService/ENGINE/PVSERVER_utils.py
@@ -62,16 +62,14 @@ def getService():
     if KernelBasis.getSSLMode():
         if __service__ is None:
             salome.salome_init()
-            __service__ = salome.lcc.FindOrLoadComponent(containerName, "PVSERVER")
-    else:
-        if __serviceLoader__ is None:
-            __serviceLoader__ = PVServer_ServiceLoader()
-        if __service__ is None:
-            import PVSERVER
-            ior = __serviceLoader__.findOrLoadService(containerName)
-            obj = getORB().string_to_object( ior )
-            __service__ = obj._narrow(PVSERVER.PVSERVER)
-            pass
+    if __serviceLoader__ is None:
+        __serviceLoader__ = PVServer_ServiceLoader()
+    if __service__ is None:
+        import PVSERVER
+        ior = __serviceLoader__.findOrLoadService(containerName)
+        obj = getORB().string_to_object( ior )
+        __service__ = obj._narrow(PVSERVER.PVSERVER)
+        pass
     return __service__
 
 ###