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
bos #26457 Factorization of ORB initialization
[modules/kernel.git]
/
src
/
SALOMEDS
/
SALOMEDS_Server.cxx
diff --git
a/src/SALOMEDS/SALOMEDS_Server.cxx
b/src/SALOMEDS/SALOMEDS_Server.cxx
index 4ca60c3db8f833c3f027f32c0f1a8305be33c35f..e62a3a26a4c110989ced9044f4770a3c11b6a25a 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_Server.cxx
+++ b/
src/SALOMEDS/SALOMEDS_Server.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
1
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
@@
-26,6
+26,8
@@
// Module : SALOME
// $Header$
//
// Module : SALOME
// $Header$
//
+#include "ArgvKeeper.hxx"
+#include "OpUtil.hxx"
#include "utilities.h"
#include "Utils_SINGLETON.hxx"
#include "utilities.h"
#include "Utils_SINGLETON.hxx"
@@
-54,16
+56,12
@@
int main(int argc, char** argv)
try
{
// Initialise the ORB.
try
{
// Initialise the ORB.
-#if OMNIORB_VERSION >= 4
- CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "omniORB4" ) ;
-#else
- CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "omniORB3" );
-#endif
+ SetArgcArgv(argc, argv);
+ CORBA::ORB_var orb = KERNEL::GetRefToORB() ;
SALOME_NamingService* NS = 0;
// Obtain a reference to the root POA.
long TIMESleep = 500000000;
int NumberOfTries = 40;
SALOME_NamingService* NS = 0;
// Obtain a reference to the root POA.
long TIMESleep = 500000000;
int NumberOfTries = 40;
- int a;
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;
@@
-89,9
+87,9
@@
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
#else
-
Sleep(TIMESleep/1000000);
+ Sleep(TIMESleep/1000000);
#endif
try
{
#endif
try
{
@@
-122,14
+120,14
@@
int main(int argc, char** argv)
MESSAGE( "SalomeDS Server: Naming Service was found" );
if(EnvL==1)
{
MESSAGE( "SalomeDS Server: Naming Service was found" );
if(EnvL==1)
{
- CORBA::ORB_var orb1 =
CORBA::ORB_init(argc,argv
) ;
+ CORBA::ORB_var orb1 =
KERNEL::GetRefToORB(
) ;
NS = SINGLETON_<SALOME_NamingService>::Instance() ;
NS->init_orb( orb1 ) ;
for(int j=1; j<=NumberOfTries; j++)
{
if (j!=1)
#ifndef WIN32
NS = SINGLETON_<SALOME_NamingService>::Instance() ;
NS->init_orb( orb1 ) ;
for(int j=1; j<=NumberOfTries; j++)
{
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
@@
-137,7
+135,7
@@
int main(int argc, char** argv)
{
object = inc->resolve(name);
}
{
object = inc->resolve(name);
}
- catch(CosNaming::NamingContext::NotFound)
+ catch(CosNaming::NamingContext::NotFound
&
)
{
MESSAGE( "SalomeDS Server: Logger Server wasn't found" ); }
{
MESSAGE( "SalomeDS Server: Logger Server wasn't found" ); }