X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2FCORBANode.cxx;h=933e610ed10f7a096ab92ebb80cd70cfc5777d65;hb=44f9643fef262a0dd98a175f3d4c58a60f65c6fc;hp=e27e90ac0be7a57048998b037256c85dcea528ba;hpb=f3b2b68ffecc5033287a7a255c8507f8989fb87f;p=modules%2Fyacs.git

diff --git a/src/runtime/CORBANode.cxx b/src/runtime/CORBANode.cxx
index e27e90ac0..933e610ed 100644
--- a/src/runtime/CORBANode.cxx
+++ b/src/runtime/CORBANode.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2013  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,9 +35,10 @@
 #include "CalStreamPort.hxx"
 #include "InPort.hxx"
 #include "TypeCode.hxx"
+#include "AutoLocker.hxx"
 
 #ifdef SALOME_KERNEL
-#include "SALOME_NamingService.hxx"
+#include "SALOME_NamingService_Wrapper.hxx"
 #include "SALOME_LifeCycleCORBA.hxx"
 #include "SALOME_Exception.hh"
 #endif
@@ -351,10 +352,7 @@ void SalomeNode::connectService()
   if(_setOfOutputDataStreamPort.size() == 0)return;
 
   CORBA::Object_var objComponent=((SalomeComponent*)_component)->getCompoPtr();
-  SALOME_NamingService 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) )
     {
@@ -398,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)
             {
@@ -467,22 +465,19 @@ void SalomeNode::disconnectService()
 {
   DEBTRACE( "SalomeNode::disconnectService: "<<getName());
   // in some rare cases, disconnectService can be called from 2 different threads
-  YACS::BASES::Lock lock(&_mutex);
+  YACS::BASES::AutoLocker<YACS::BASES::Mutex> lock(&_mutex);
 
   if(ids.size() == 0)
     return;
 
-  SALOME_NamingService 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
         {
-          manager->disconnect(*iter,Engines::DSC::RemovingConnection);
+          manager.disconnect(*iter,Engines::DSC::RemovingConnection);
         }
       catch(Engines::ConnectionManager::BadId& ex)
         {