[tuleap29134] : fix pvsimple import in SSL mode

[modules/gui.git] / src / PVServerService / ServiceLoader / PVServer_ServiceLoader.cxx

diff --git a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx
index b050c27da75299ca4a5ce0edc341b8f700f1e015..c2c0cf324bfa34e96ae450c68cf9adbd4c83cf5b 100644 (file)
--- a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx
+++ b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx
@@ -24,14 +24,22 @@
 #include <SALOME_NamingService.hxx>
 #include <utilities.h> // MESSAGE() macro
 #include <SALOMEconfig.h>
+#include "KernelBasis.hxx"
+
 #include CORBA_CLIENT_HEADER(SALOME_ContainerManager)
 
 PVServer_ServiceLoader::PVServer_ServiceLoader():
-  myLcc( 0 )
+  myLcc( nullptr )
 {
   try
   {
-      myLcc = new SALOME_LifeCycleCORBA();
+      SALOME_NamingService_Abstract *ns(nullptr);
+      if( getSSLMode() )
+      {
+        mySSLNS.reset( new SALOME_Fake_NamingService );
+        ns = mySSLNS.get();
+      }
+      myLcc = new SALOME_LifeCycleCORBA(ns);
   }
   catch(...)
   {