python_test_driver.py declination of salome_test_driver.py for SSL mode (timeout...

[modules/kernel.git] / src / Registry / SALOME_Registry_Server.cxx

diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx
index 4ee6ea453e8c30ba9745f05c36380e933811ee54..7627bd33ecee8333ac13ca4fbbbcd5b124eadb02 100644 (file)
--- a/src/Registry/SALOME_Registry_Server.cxx
+++ b/src/Registry/SALOME_Registry_Server.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -77,9 +77,6 @@ int main( int argc , char **argv )
   const char *registryName = "Registry" ;
   long TIMESleep = 250000000;
   int NumberOfTries = 40;
-#ifndef WIN32
-  int a;
-#endif
   timespec ts_req;
   ts_req.tv_nsec=TIMESleep;
   ts_req.tv_sec=0;
@@ -106,7 +103,7 @@ int main( int argc , char **argv )
     {
       if (i!=1) 
 #ifndef WIN32
-        a=nanosleep(&ts_req,&ts_rem);
+        nanosleep(&ts_req,&ts_rem);
 #else
     Sleep(TIMESleep/1000000);
 #endif
@@ -135,7 +132,7 @@ int main( int argc , char **argv )
                 {
                   if (j!=1) 
 #ifndef WIN32
-                    a=nanosleep(&ts_req, &ts_rem);
+                    nanosleep(&ts_req, &ts_rem);
 #else
                         Sleep(TIMESleep/1000000);
 #endif
@@ -143,7 +140,7 @@ int main( int argc , char **argv )
                     {
                       object = inc->resolve(name);
                     }
-                  catch(CosNaming::NamingContext::NotFound)
+                  catch(CosNaming::NamingContext::NotFound&)
                     {
                       MESSAGE( "Registry Server: Logger Server wasn't found" );
                     }
@@ -170,7 +167,17 @@ int main( int argc , char **argv )
       RegistryService *ptrRegistry = SINGLETON_<RegistryService>::Instance() ;
       ptrRegistry->SessionName( ptrSessionName ) ;
       ptrRegistry->SetOrb(orb);
-      varComponents = ptrRegistry->_this() ;
+      //
+      CORBA::PolicyList policies;
+      policies.length(1);
+      PortableServer::ThreadPolicy_var threadPol(poa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL));
+      policies[0]=PortableServer::ThreadPolicy::_duplicate(threadPol);
+      PortableServer::POA_var poa2(poa->create_POA("SingleThreadPOA4RegistryStandalone",manager,policies));
+      threadPol->destroy();
+      //
+      PortableServer::ObjectId_var id(poa2->activate_object(ptrRegistry));
+      CORBA::Object_var pipo=poa2->id_to_reference(id);
+      varComponents = Registry::Components::_narrow(pipo) ;
       ptrRegistry->_remove_ref(); //let poa manage registryservice deletion
       // The RegistryService must not already exist.