Updated copyright comment

[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 f0ee4677dd1dc819bb177e91155a5f30ee9f2d70..c1055624d0b30c6d563916682245c20318bc5a71 100644 (file)
--- a/src/PVServerService/ENGINE/PVSERVER_utils.py
+++ b/src/PVServerService/ENGINE/PVSERVER_utils.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2015-2024  CEA, EDF, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,7 @@
 # Author : Adrien BRUNETON (CEA)
 #
 
+import salome
 from omniORB import CORBA
 from SALOME_NamingServicePy import SALOME_NamingServicePy_i
 import SALOMEDS
@@ -28,7 +29,7 @@ import PVSERVER_ORB
 
 ###
 # Get verbose level
-### 
+###
 __verbose__ = None
 def verbose():
     import os
@@ -45,35 +46,24 @@ def verbose():
 ###
 # Get ORB reference
 ###
-__orb__ = None
 def getORB():
-    global __orb__
-    if __orb__ is None:
-        __orb__ = CORBA.ORB_init( [''], CORBA.ORB_ID )
-        pass
-    return __orb__
-
-###
-# Get naming service instance
-###
-__naming_service__ = None
-def getNS():
-    global __naming_service__
-    if __naming_service__ is None:
-        __naming_service__ = SALOME_NamingServicePy_i( getORB() )
-        pass
-    return __naming_service__
+    salome.salome_init()
+    return salome.orb
 
 ###
 # Get PVSERVER service
 ###
 __service__ = None
 __serviceLoader__ = None
-def getService():    
+def getService():
     global __service__, __serviceLoader__
+    import KernelBasis
     containerName = "FactoryServer"
+    if KernelBasis.getSSLMode():
+        if __service__ is None:
+            salome.salome_init()
     if __serviceLoader__ is None:
-        __serviceLoader__ = PVServer_ServiceLoader() 
+        __serviceLoader__ = PVServer_ServiceLoader()
     if __service__ is None:
         import PVSERVER
         ior = __serviceLoader__.findOrLoadService(containerName)