-// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 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
*/
//=============================================================================
-SALOME_LifeCycleCORBA::SALOME_LifeCycleCORBA(SALOME_NamingService *ns)
+SALOME_LifeCycleCORBA::SALOME_LifeCycleCORBA(SALOME_NamingService_Abstract *ns)
{
// be sure to have an instance of traceCollector, when used via SWIG
// in a Python module
// not enough: set a current directory in naming service is not thread safe
// if naming service instance is shared among several threads...
// ==> always use absolute path and don't rely on current directory!
-
- CORBA::Object_var obj =
- _NS->Resolve(SALOME_ContainerManager::_ContainerManagerNameInNS);
- if (CORBA::is_nil(obj))
- throw SALOME_Exception("Error: Cannot resolve ContainerManager in Naming Service");
- _ContManager=Engines::ContainerManager::_narrow(obj);
-
- obj = _NS->Resolve(SALOME_ResourcesManager::_ResourcesManagerNameInNS);
- if (CORBA::is_nil(obj))
- throw SALOME_Exception("Error: Cannot resolve ResourceManager in Naming Service");
- _ResManager=Engines::ResourcesManager::_narrow(obj);
+ //if( dynamic_cast<SALOME_NamingService *>(_NS) )
+ {
+ CORBA::Object_var obj =
+ _NS->Resolve(SALOME_ContainerManager::_ContainerManagerNameInNS);
+ if (CORBA::is_nil(obj))
+ throw SALOME_Exception("Error: Cannot resolve ContainerManager in Naming Service");
+ _ContManager=Engines::ContainerManager::_narrow(obj);
+
+ obj = _NS->Resolve(SALOME_ResourcesManager::_ResourcesManagerNameInNS);
+ if (CORBA::is_nil(obj))
+ throw SALOME_Exception("Error: Cannot resolve ResourceManager in Naming Service");
+ _ResManager=Engines::ResourcesManager::_narrow(obj);
+ }
}
//=============================================================================
{
listOfResources = _ResManager->GetFittingResources(new_params.resource_params);
}
- catch( const SALOME::SALOME_Exception& ex )
+ catch( const SALOME::SALOME_Exception& /*ex*/ ) //!< TODO: unused variable
{
return Engines::EngineComponent::_nil();
}
{
listOfResources = _ResManager->GetFittingResources(new_params.resource_params);
}
- catch( const SALOME::SALOME_Exception& ex )
+ catch( const SALOME::SALOME_Exception& /*ex*/ ) //!< TODO: unused variable
{
return Engines::EngineComponent::_nil();
}
{
listOfResources = _ResManager->GetFittingResources(new_params.resource_params);
}
- catch( const SALOME::SALOME_Exception& ex )
+ catch( const SALOME::SALOME_Exception& /*ex*/ ) //!< TODO: unused variable
{
return Engines::EngineComponent::_nil();
}
// --- Check if containerName contains machine name (if yes: rg>0)
char *stContainer=strdup(containerName);
std::string st2Container(stContainer);
- int rg=st2Container.find("/");
+ size_t rg=st2Container.find("/");
Engines::ContainerParameters params;
preSet(params);
- if (rg<0)
+ if (rg == std::string::npos)
{
// containerName doesn't contain "/" => Local container
params.container_name = CORBA::string_dup(stContainer);
if ( !CORBA::is_nil(connMan) && ( pid != connMan->getPID() ) )
connMan->ShutdownWithExit();
}
- catch(const CORBA::Exception& e)
+ catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
{
// ignore and continue
}
study->Shutdown();
_NS->Destroy_Name("/Study");
}
- catch(const CORBA::Exception& e)
+ catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
{
// ignore and continue
}
catalog->shutdown();
_NS->Destroy_Name("/Kernel/ModulCatalog");
}
- catch(const CORBA::Exception& e)
+ catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
{
// ignore and continue
}
if ( !CORBA::is_nil(dsm) )
dsm->shutdownScopes();
}
- catch(const CORBA::Exception& e)
+ catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
{
// ignore and continue
}
if ( !CORBA::is_nil(dsm) )
dsm->shutdownServers();
}
- catch(const CORBA::Exception& e)
+ catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
{
// ignore and continue
}
launcher->Shutdown();
}
}
- catch(const CORBA::Exception& e)
+ catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
{
// ignore and continue
}
registry->Shutdown();
_NS->Destroy_Name("/Registry");
}
- catch(const CORBA::Exception& e)
+ catch(const CORBA::Exception& /*e*/) //!< TODO: unused variable
{
// ignore and continue
}
*
* \return the naming service
*/
-SALOME_NamingService * SALOME_LifeCycleCORBA::namingService()
+SALOME_NamingService_Abstract * SALOME_LifeCycleCORBA::namingService()
{
return _NS;
}
*/
CORBA::ORB_ptr SALOME_LifeCycleCORBA::orb()
{
- return _NS->orb();
+ SALOME_NamingService *NSC = dynamic_cast<SALOME_NamingService *>(_NS);
+ if(!_NS)
+ THROW_SALOME_EXCEPTION("SALOME_LifeCycleCORBA::orb : not a CORBA SALOME_NamingService ");
+ return NSC->orb();
}