X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2FCORBANode.cxx;h=933e610ed10f7a096ab92ebb80cd70cfc5777d65;hb=44f9643fef262a0dd98a175f3d4c58a60f65c6fc;hp=1f9dedc8bf3951d2377401345c4374467b210740;hpb=b2e3b7ba5543af268ca3331a682456023fba2bfd;p=modules%2Fyacs.git diff --git a/src/runtime/CORBANode.cxx b/src/runtime/CORBANode.cxx index 1f9dedc8b..933e610ed 100644 --- a/src/runtime/CORBANode.cxx +++ b/src/runtime/CORBANode.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2006-2021 CEA/DEN, EDF R&D +// Copyright (C) 2006-2024 CEA, EDF // // 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(); - 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) ) { @@ -399,7 +396,7 @@ void SalomeNode::connectService() } 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) { @@ -473,17 +470,14 @@ void SalomeNode::disconnectService() 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::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) {