From 3fde623b7967e85a8f5d5018177bac74ec4ee9ea Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 10 Jun 2021 09:50:30 +0200 Subject: [PATCH] Container servant hold information about SSL mode or not --- src/Session/Session_NS_wrapper.cxx | 4 ++-- src/Session/Session_NS_wrapper.hxx | 6 +++--- src/Session/Session_ServerThread.hxx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Session/Session_NS_wrapper.cxx b/src/Session/Session_NS_wrapper.cxx index a5dd110a7..2619179e4 100644 --- a/src/Session/Session_NS_wrapper.cxx +++ b/src/Session/Session_NS_wrapper.cxx @@ -62,7 +62,7 @@ void CommonActivateSession(CORBA::ORB_var orb, PortableServer::POA_var poa, QMut } } -Engines_Container_i *OldStyleNS::activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char **argv) +Abstract_Engines_Container_i *OldStyleNS::activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char **argv) { Engines_Container_i *_container = nullptr; try @@ -230,7 +230,7 @@ void NewStyleNS::defineDefaultSALOMEKERNELNamingService() KERNEL::assignNamingServiceSL(); } -Engines_Container_i *NewStyleNS::activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char **argv) +Abstract_Engines_Container_i *NewStyleNS::activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char **argv) { return KERNEL::getContainerSA(); } diff --git a/src/Session/Session_NS_wrapper.hxx b/src/Session/Session_NS_wrapper.hxx index e7a62adda..aa6466be2 100644 --- a/src/Session/Session_NS_wrapper.hxx +++ b/src/Session/Session_NS_wrapper.hxx @@ -27,7 +27,7 @@ class QMutex; class QWaitCondition; -class Engines_Container_i; +class Abstract_Engines_Container_i; class SESSION_EXPORT OldStyleNS { @@ -38,7 +38,7 @@ public: void Register(CORBA::Object_ptr ObjRef, const char* Path) { _NS.Register(ObjRef,Path); } CORBA::Object_ptr Resolve(const char* Path) { return _NS.Resolve(Path); } RealNS *getNS() { return &_NS; } - Engines_Container_i *activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char** argv); + Abstract_Engines_Container_i *activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char** argv); static void defineDefaultSALOMEKERNELNamingService() { /* nothing to do by default true NamingService server is considered */ } static void activateContainerManager(CORBA::ORB_var orb); static void activateSession(CORBA::ORB_var orb, PortableServer::POA_var poa, QMutex *GUIMutex, QWaitCondition *GUILauncher, int argc, char ** argv); @@ -61,7 +61,7 @@ public: void Register(CORBA::Object_ptr ObjRef, const char* Path) { _NS.Register(ObjRef,Path); } CORBA::Object_ptr Resolve(const char* Path) { return _NS.Resolve(Path); } RealNS *getNS() { return &_NS; } - Engines_Container_i *activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char** argv); + Abstract_Engines_Container_i *activateContainer(CORBA::ORB_var orb, PortableServer::POA_var poa, int argc, char** argv); static void defineDefaultSALOMEKERNELNamingService(); static void activateContainerManager(CORBA::ORB_var orb); static void activateSession(CORBA::ORB_var orb, PortableServer::POA_var poa, QMutex *GUIMutex, QWaitCondition *GUILauncher, int argc, char ** argv); diff --git a/src/Session/Session_ServerThread.hxx b/src/Session/Session_ServerThread.hxx index ee783f4fe..1e72f07cd 100644 --- a/src/Session/Session_ServerThread.hxx +++ b/src/Session/Session_ServerThread.hxx @@ -37,7 +37,7 @@ void WaitForServerReadiness(std::string serverName); class SALOME_NamingService; -class Engines_Container_i; +class Abstract_Engines_Container_i; template class SESSION_EXPORT Session_ServerThread @@ -72,7 +72,7 @@ protected: CORBA::ORB_var _orb; PortableServer::POA_var _root_poa; std::unique_ptr _NS; - Engines_Container_i* _container; + Abstract_Engines_Container_i* _container; }; class QMutex; -- 2.39.2