From b1490ac170db7836a409fa0d4631e3f9e299ea74 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 17 Aug 2022 16:56:16 +0200 Subject: [PATCH] Remaining subclass of Engines_Component_i not managing SSL --- src/SyrComponent/SyrComponent_Impl.cxx | 17 ++++++++++++--- src/SyrComponent/SyrComponent_Impl.hxx | 29 ++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/SyrComponent/SyrComponent_Impl.cxx b/src/SyrComponent/SyrComponent_Impl.cxx index 65a937a..49e1e53 100644 --- a/src/SyrComponent/SyrComponent_Impl.cxx +++ b/src/SyrComponent/SyrComponent_Impl.cxx @@ -272,9 +272,20 @@ SuperVisionTest::ListOfSyr_ptr SyrComponent_Impl::C_LISTOFSYR() { #else Sleep(S*1000); #endif - ListOfSyr_Impl * aNewListOfSyr = new ListOfSyr_Impl( _orb , _poa, _contId, + ListOfSyr_Impl * aNewListOfSyr = nullptr; + Engines::Container_var cont = this->GetContainerRef(); + if( cont->is_SSL_mode() ) + { + aNewListOfSyr = new ListOfSyr_Impl_SSL( _orb , _poa, _contId, instanceName() , interfaceName() , graphName() , nodeName() ) ; + } + else + { + aNewListOfSyr = new ListOfSyr_Impl_No_SSL( _orb , _poa, _contId, + instanceName() , interfaceName() , + graphName() , nodeName() ) ; + } SuperVisionTest::ListOfSyr_var iobject = (SuperVisionTest::ListOfSyr_var ) NULL ; PortableServer::ObjectId * id = aNewListOfSyr->getId() ; CORBA::Object_var obj = _poa->id_to_reference(*id); @@ -358,8 +369,8 @@ ListOfSyr_Impl::ListOfSyr_Impl( CORBA::ORB_ptr orb , const char * instanceName , const char * interfaceName , const char * graphName , - const char * nodeName ) : - Engines_Component_i(orb, poa, contId, instanceName, interfaceName,1,true) { + const char * nodeName, bool withRegistry) : + Engines_Component_i(orb, poa, contId, instanceName, interfaceName,1,withRegistry) { Names( graphName , nodeName ) ; MESSAGE("ListOfSyr_Impl::ListOfSyr_Impl activate object instanceName(" << instanceName << ") interfaceName(" << interfaceName << ") --> " diff --git a/src/SyrComponent/SyrComponent_Impl.hxx b/src/SyrComponent/SyrComponent_Impl.hxx index 31dd27c..7b29003 100644 --- a/src/SyrComponent/SyrComponent_Impl.hxx +++ b/src/SyrComponent/SyrComponent_Impl.hxx @@ -117,15 +117,16 @@ public: class SYRCOMPONENTENGINE_EXPORT ListOfSyr_Impl : public POA_SuperVisionTest::ListOfSyr , public Engines_Component_i { -public: +protected: ListOfSyr_Impl( CORBA::ORB_ptr orb , PortableServer::POA_ptr poa , PortableServer::ObjectId * contId , const char *instanceName , const char *interfaceName , const char * graphName , - const char * nodeName ) ; + const char * nodeName, bool withRegistry ) ; ListOfSyr_Impl() ; +public: virtual ~ListOfSyr_Impl(); virtual char* getVersion(); @@ -139,6 +140,30 @@ private: }; +class SYRCOMPONENTENGINE_EXPORT ListOfSyr_Impl_SSL : public ListOfSyr_Impl +{ +public: + ListOfSyr_Impl_SSL( CORBA::ORB_ptr orb , + PortableServer::POA_ptr poa , + PortableServer::ObjectId * contId , + const char *instanceName , + const char *interfaceName , + const char * graphName , + const char * nodeName):ListOfSyr_Impl(orb,poa,contId,instanceName,interfaceName,graphName,nodeName,false) { } +}; + +class SYRCOMPONENTENGINE_EXPORT ListOfSyr_Impl_No_SSL : public ListOfSyr_Impl +{ +public: + ListOfSyr_Impl_No_SSL( CORBA::ORB_ptr orb , + PortableServer::POA_ptr poa , + PortableServer::ObjectId * contId , + const char *instanceName , + const char *interfaceName , + const char * graphName , + const char * nodeName):ListOfSyr_Impl(orb,poa,contId,instanceName,interfaceName,graphName,nodeName,true) { } +}; + extern "C" SYRCOMPONENTENGINE_EXPORT PortableServer::ObjectId * SyrComponentEngine_factory -- 2.39.2