Duplication of code preventing SHAPER module to work in SSL mode

diff --git a/src/SalomeApp/SalomeApp_Engine_i.cxx b/src/SalomeApp/SalomeApp_Engine_i.cxx
index 4f5a82f0004e52a230a6ed45935e1cd96aeee314..cc3742d7ccb11d7fe2a403a2037e786fd9eb7fc9 100644 (file)
--- a/src/SalomeApp/SalomeApp_Engine_i.cxx
+++ b/src/SalomeApp/SalomeApp_Engine_i.cxx
@@ -366,10 +366,9 @@ PortableServer::POA_var SalomeApp_Engine_i::poa()
 /*!
   \return 
 */
-SALOME_NamingService* SalomeApp_Engine_i::namingService()
+SALOME_NamingService_Abstract* SalomeApp_Engine_i::namingService()
 {
-  static SALOME_NamingService _ns(orb());
-  return &_ns;
+  return SalomeApp_Application::namingService();
 }
 
 /*!

diff --git a/src/SalomeApp/SalomeApp_Engine_i.h b/src/SalomeApp/SalomeApp_Engine_i.h
index 2b4137a524f7f5fb1409b5d21fa9e504b898328b..9de78b81089af0010c83dbfdea7bdfccd326bceb 100644 (file)
--- a/src/SalomeApp/SalomeApp_Engine_i.h
+++ b/src/SalomeApp/SalomeApp_Engine_i.h
@@ -38,7 +38,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SalomeApp_Engine)
 
-class SALOME_NamingService;
+class SALOME_NamingService_Abstract;
 
 class SALOMEAPP_EXPORT SalomeApp_Engine_i: public POA_SalomeApp::Engine,
                                           public Engines_Component_i
@@ -99,7 +99,7 @@ public:
 private:
   static CORBA::ORB_var              orb();
   static PortableServer::POA_var     poa();
-  static SALOME_NamingService*       namingService();
+  static SALOME_NamingService_Abstract*       namingService();
 private:
   MapOfFiles                         myListOfFiles;
   bool                               myKeepFiles;