Remaining subclass of Engines_Component_i not managing SSL

diff --git a/src/SyrComponent/SyrComponent_Impl.cxx b/src/SyrComponent/SyrComponent_Impl.cxx
index 65a937a97d46e33bfdf6ebf7f2d52ba1392e60e9..49e1e531a2dde96dc2d84c7a6bad7e8aa585673c 100644 (file)
--- 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 31dd27c6d127c565f134a410f11aded106f2aea3..7b2900345f243eae1c587d329002595cedd789c2 100644 (file)
--- 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