-// Copyright (C) 2021 CEA/DEN, EDF R&D
+// Copyright (C) 2021-2022 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include "SALOME_KernelServices.hxx"
#include "SALOME_Fake_NamingService.hxx"
#include "SALOME_ModuleCatalog_impl.hxx"
+#include "Utils_SINGLETON.hxx"
SMESH_Gen_No_Session_i::SMESH_Gen_No_Session_i( CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
const char* instanceName,
const char* interfaceName):SMESH_Gen_i(orb,poa,contId,instanceName,interfaceName,false)
{
+ myNS = SINGLETON_<SALOME_Fake_NamingService>::Instance();
}
GEOM::GEOM_Gen_var SMESH_Gen_No_Session_i::GetGeomEngine( bool isShaper )
{
- CORBA::Object_var temp = KERNEL::RetrieveCompo(isShaper ? "SHAPERSTUDY" : "GEOM");
+ CORBA::Object_var temp;
+ try
+ {
+ temp = KERNEL::RetrieveCompo(isShaper ? "SHAPERSTUDY" : "GEOM");
+ }
+ catch(...)
+ {
+ return GEOM::GEOM_Gen::_nil();
+ }
myGeomGen = GEOM::GEOM_Gen::_narrow( temp );
return myGeomGen;
}