Updated copyright comment

[samples/component.git] / src / SIGNALSComponent / SIGNALSComponent_Impl.cxx

diff --git a/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx b/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 4055075..e3e51d0
--- a/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx
+++ b/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -43,11 +43,11 @@ SIGNALSComponent_Impl::SIGNALSComponent_Impl( CORBA::ORB_ptr orb,
                                    PortableServer::POA_ptr poa,
                                    PortableServer::ObjectId * contId, 
                                    const char *instanceName,
-                                    const char *interfaceName) :
-  Engines_Component_i(orb, poa, contId, instanceName, interfaceName,1,true)
+                                    const char *interfaceName, bool withRegistry) :
+  Engines_Component_i(orb, poa, contId, instanceName, interfaceName,1,withRegistry)
 {
   MESSAGE("SIGNALSComponent_Impl::SIGNALSComponent_Impl activate object instanceName("
-          << instanceName << ") interfaceName(" << interfaceName << ")" )
+          << instanceName << ") interfaceName(" << interfaceName << ")" );
   _thisObj = this ;
   _id = _poa->activate_object(_thisObj);
   NULLPTR = NULL ;
@@ -88,9 +88,9 @@ CORBA::Long SIGNALSComponent_Impl::SIGSEGVfunc() {
 #else
   Sleep(S*1000);
 #endif
-  long nullptr = *NULLPTR ;
+  long _nullptr = *NULLPTR ;
   endService( " SIGNALSComponent_Impl::SIGSEGVfunc"  );
-  return nullptr ;
+  return _nullptr ;
 }
 
 CORBA::Long SIGNALSComponent_Impl::SIGFPEfunc( CORBA::Long a , CORBA::Long b ) {
@@ -151,8 +151,17 @@ extern "C"
   {
     MESSAGE("SIGNALSComponentEngine_factory SIGNALSComponent_Impl("
             << instanceName << "," << interfaceName << ")");
-    SIGNALSComponent_Impl * mySIGNALSComponent 
-      = new SIGNALSComponent_Impl(orb, poa, contId, instanceName, interfaceName);
+    SIGNALSComponent_Impl * mySIGNALSComponent = nullptr;
+    CORBA::Object_var o = poa->id_to_reference(*contId);
+    Engines::Container_var cont = Engines::Container::_narrow(o);    
+    if(cont->is_SSL_mode())
+    {
+      mySIGNALSComponent = new SIGNALSComponentEngine_SSL(orb, poa, contId, instanceName, interfaceName);
+    }
+    else
+    {
+      mySIGNALSComponent = new SIGNALSComponentEngine_No_SSL(orb, poa, contId, instanceName, interfaceName);
+    }
     return mySIGNALSComponent->getId() ;
   }
 }