Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 4064394e7650ad449e76d3141ff956bf8507733a..7627bd33ecee8333ac13ca4fbbbcd5b124eadb02 100644
(file)
--- a/
src/Registry/SALOME_Registry_Server.cxx
+++ b/
src/Registry/SALOME_Registry_Server.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
//
// 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;
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;
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
{
if (i!=1)
#ifndef WIN32
-
a=
nanosleep(&ts_req,&ts_rem);
+ nanosleep(&ts_req,&ts_rem);
#else
Sleep(TIMESleep/1000000);
#endif
#else
Sleep(TIMESleep/1000000);
#endif
@@
-135,7
+132,7
@@
int main( int argc , char **argv )
{
if (j!=1)
#ifndef WIN32
{
if (j!=1)
#ifndef WIN32
-
a=
nanosleep(&ts_req, &ts_rem);
+ nanosleep(&ts_req, &ts_rem);
#else
Sleep(TIMESleep/1000000);
#endif
#else
Sleep(TIMESleep/1000000);
#endif
@@
-143,7
+140,7
@@
int main( int argc , char **argv )
{
object = inc->resolve(name);
}
{
object = inc->resolve(name);
}
- catch(CosNaming::NamingContext::NotFound)
+ catch(CosNaming::NamingContext::NotFound
&
)
{
MESSAGE( "Registry Server: Logger Server wasn't found" );
}
{
MESSAGE( "Registry Server: Logger Server wasn't found" );
}
@@
-175,7
+172,7
@@
int main( int argc , char **argv )
policies.length(1);
PortableServer::ThreadPolicy_var threadPol(poa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL));
policies[0]=PortableServer::ThreadPolicy::_duplicate(threadPol);
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("SingleTh
POA4SDS
",manager,policies));
+ PortableServer::POA_var poa2(poa->create_POA("SingleTh
readPOA4RegistryStandalone
",manager,policies));
threadPol->destroy();
//
PortableServer::ObjectId_var id(poa2->activate_object(ptrRegistry));
threadPol->destroy();
//
PortableServer::ObjectId_var id(poa2->activate_object(ptrRegistry));