-// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022 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
#include "SMESHDS_Mesh.hxx"
#include "SMESHDS_Script.hxx"
#include "SMESH_Mesh.hxx"
-#include "SMESH_Component_Generator.hxx"
#include "SALOME_NamingService.hxx"
#include "SALOME_Fake_NamingService.hxx"
if(CORBA::is_nil(aMeshGen.in()))
{
- Engines::EngineComponent_var isCompoInSSLMode = GetSMESHInstanceHasThis();
- if( CORBA::is_nil(isCompoInSSLMode) )
- {
#ifdef WIN32
- long aClientPID = (long)_getpid();
+ long aClientPID = (long)_getpid();
#else
- long aClientPID = (long)getpid();
+ long aClientPID = (long)getpid();
#endif
- std::unique_ptr<SALOME_NamingService_Abstract> aNamingService;
- if(getSSLMode())
- {
- aNamingService.reset(new SALOME_Fake_NamingService);
- }
- else
- {
- aNamingService.reset(new SALOME_NamingService(theORB));
- }
- SALOME_LifeCycleCORBA aLifeCycleCORBA(aNamingService.get());
- Engines::EngineComponent_var aComponent = aLifeCycleCORBA.FindOrLoad_Component("FactoryServer","SMESH");
- aMeshGen = SMESH::SMESH_Gen::_narrow(aComponent);
-
- std::string aClientHostName = Kernel_Utils::GetHostname();
- Engines::Container_var aServerContainer = aMeshGen->GetContainerRef();
- CORBA::String_var aServerHostName = aServerContainer->getHostName();
- CORBA::Long aServerPID = aServerContainer->getPID();
- aMeshGen->SetEmbeddedMode((aClientPID == aServerPID) && (aClientHostName == aServerHostName.in()));
+ std::unique_ptr<SALOME_NamingService_Abstract> aNamingService;
+ if(getSSLMode())
+ {
+ aNamingService.reset(new SALOME_Fake_NamingService);
}
else
{
- aMeshGen = SMESH::SMESH_Gen::_narrow(isCompoInSSLMode);
+ aNamingService.reset(new SALOME_NamingService(theORB));
}
-
+ SALOME_LifeCycleCORBA aLifeCycleCORBA(aNamingService.get());
+ Engines::EngineComponent_var aComponent = aLifeCycleCORBA.FindOrLoad_Component("FactoryServer","SMESH");
+ aMeshGen = SMESH::SMESH_Gen::_narrow(aComponent);
+
+ std::string aClientHostName = Kernel_Utils::GetHostname();
+ Engines::Container_var aServerContainer = aMeshGen->GetContainerRef();
+ CORBA::String_var aServerHostName = aServerContainer->getHostName();
+ CORBA::Long aServerPID = aServerContainer->getPID();
+ aMeshGen->SetEmbeddedMode((aClientPID == aServerPID) && (aClientHostName == aServerHostName.in()));
}
theIsEmbeddedMode = aMeshGen->IsEmbeddedMode();
return aMeshGen;