Salome HOME
projects
/
modules
/
yacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Help to debug when troubles at launch time
[modules/yacs.git]
/
src
/
runtime
/
CORBANode.cxx
diff --git
a/src/runtime/CORBANode.cxx
b/src/runtime/CORBANode.cxx
index 1f9dedc8bf3951d2377401345c4374467b210740..933e610ed10f7a096ab92ebb80cd70cfc5777d65 100644
(file)
--- a/
src/runtime/CORBANode.cxx
+++ b/
src/runtime/CORBANode.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2006-202
1 CEA/DEN, EDF R&D
+// Copyright (C) 2006-202
4 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-352,10
+352,7
@@
void SalomeNode::connectService()
if(_setOfOutputDataStreamPort.size() == 0)return;
CORBA::Object_var objComponent=((SalomeComponent*)_component)->getCompoPtr();
if(_setOfOutputDataStreamPort.size() == 0)return;
CORBA::Object_var objComponent=((SalomeComponent*)_component)->getCompoPtr();
- SALOME_NamingService_Wrapper NS(getSALOMERuntime()->getOrb()) ;
- SALOME_LifeCycleCORBA LCC(&NS) ;
- CORBA::Object_var obj = NS.Resolve("/ConnectionManager");
- Engines::ConnectionManager_var manager=Engines::ConnectionManager::_narrow(obj);
+ ConnectionManager& manager = getSALOMERuntime()->getConnectionManager();
Engines::Superv_Component_var me=Engines::Superv_Component::_narrow(objComponent);
if( CORBA::is_nil(me) )
{
Engines::Superv_Component_var me=Engines::Superv_Component::_narrow(objComponent);
if( CORBA::is_nil(me) )
{
@@
-399,7
+396,7
@@
void SalomeNode::connectService()
}
try
{
}
try
{
- id=manager
->
connect(me,port->getName().c_str(),other,(*iterout)->getName().c_str());
+ id=manager
.
connect(me,port->getName().c_str(),other,(*iterout)->getName().c_str());
}
catch(Engines::DSC::PortNotDefined& ex)
{
}
catch(Engines::DSC::PortNotDefined& ex)
{
@@
-473,17
+470,14
@@
void SalomeNode::disconnectService()
if(ids.size() == 0)
return;
if(ids.size() == 0)
return;
- SALOME_NamingService_Wrapper NS(getSALOMERuntime()->getOrb()) ;
- SALOME_LifeCycleCORBA LCC(&NS) ;
- CORBA::Object_var obj = NS.Resolve("/ConnectionManager");
- Engines::ConnectionManager_var manager=Engines::ConnectionManager::_narrow(obj);
+ ConnectionManager& manager = getSALOMERuntime()->getConnectionManager();
std::list<Engines::ConnectionManager::connectionId>::iterator iter;
for(iter = ids.begin(); iter != ids.end(); iter++)
{
DEBTRACE("Trying to disconnect: " << *iter );
try
{
std::list<Engines::ConnectionManager::connectionId>::iterator iter;
for(iter = ids.begin(); iter != ids.end(); iter++)
{
DEBTRACE("Trying to disconnect: " << *iter );
try
{
- manager
->
disconnect(*iter,Engines::DSC::RemovingConnection);
+ manager
.
disconnect(*iter,Engines::DSC::RemovingConnection);
}
catch(Engines::ConnectionManager::BadId& ex)
{
}
catch(Engines::ConnectionManager::BadId& ex)
{