Remaining subclass of Engines_Component_i not managing SSL

diff --git a/src/DataStreamComponent/DataStreamComponent_Impl.cxx b/src/DataStreamComponent/DataStreamComponent_Impl.cxx
index 0f13d9bd1c5b8255c873cec617b0500bfbc7c5ef..2b5e291821eb0f0a9d1003916e93029a47bbed7a 100644 (file)
--- a/src/DataStreamComponent/DataStreamComponent_Impl.cxx
+++ b/src/DataStreamComponent/DataStreamComponent_Impl.cxx
@@ -94,10 +94,20 @@ void DataStreamFactory_Impl::Div( CORBA::Long x , CORBA::Long y , CORBA::Long &
 DataStreamComponent::DataStream_ptr DataStreamFactory_Impl::NewDataStream() {
   beginService( "DataStreamFactory_Impl::NewDataStream" );
   sendMessage(NOTIF_STEP, "DataStreamFactory_Impl creates DataStream_Impl");
-  DataStream_Impl * myDataStream ;
-  myDataStream = new DataStream_Impl( _orb , _poa, _contId,
+  DataStream_Impl * myDataStream = nullptr;
+  Engines::Container_var cont = this->GetContainerRef();
+  if( cont->is_SSL_mode() )
+  {
+    myDataStream = new DataStream_Impl_SSL( _orb , _poa, _contId,
                                       instanceName() , interfaceName() ,
                                       graphName() , nodeName() ) ;
+  }
+  else
+  {
+    myDataStream = new DataStream_Impl_No_SSL( _orb , _poa, _contId,
+                                      instanceName() , interfaceName() ,
+                                      graphName() , nodeName() ) ;
+  }
   DataStreamComponent::DataStream_var iobject ;
   PortableServer::ObjectId * id = myDataStream->getId() ;
   CORBA::Object_var obj = _poa->id_to_reference(*id);
@@ -143,8 +153,8 @@ DataStream_Impl::DataStream_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("DataStream_Impl::DataStream_Impl activate object instanceName("
           << instanceName << ") interfaceName(" << interfaceName << ") --> "

diff --git a/src/DataStreamComponent/DataStreamComponent_Impl.hxx b/src/DataStreamComponent/DataStreamComponent_Impl.hxx
index d5e4403bfab560d11175793f2da84243f95c092b..c2440ee30a348df2a9e38da4f0715aeb8f3161b5 100644 (file)
--- a/src/DataStreamComponent/DataStreamComponent_Impl.hxx
+++ b/src/DataStreamComponent/DataStreamComponent_Impl.hxx
@@ -108,7 +108,7 @@ extern "C"
 
 class DATASTREAMFACTORYENGINE_EXPORT DataStream_Impl :  public POA_DataStreamComponent::DataStream ,
                                                         public Engines_Component_i {
-public:
+protected:
   DataStream_Impl() ;
   DataStream_Impl( CORBA::ORB_ptr orb ,
                   PortableServer::POA_ptr poa ,
@@ -116,7 +116,7 @@ public:
                   const char *instanceName ,
                    const char *interfaceName , 
                    const char * graphName ,
-                   const char * nodeName );
+                   const char * nodeName, bool withRegistry );
 
   virtual ~DataStream_Impl();
 
@@ -138,4 +138,26 @@ private:
 
 };
 
+class DATASTREAMFACTORYENGINE_EXPORT DataStream_Impl_SSL :  public DataStream_Impl {
+public:
+  DataStream_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):DataStream_Impl(orb,poa,contId,instanceName,interfaceName,graphName,nodeName,false) { }
+};
+
+class DATASTREAMFACTORYENGINE_EXPORT DataStream_Impl_No_SSL :  public DataStream_Impl {
+public:
+  DataStream_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):DataStream_Impl(orb,poa,contId,instanceName,interfaceName,graphName,nodeName,true) { }
+};
+
 #endif