From a9cddd8ce9b9c127920af53408846d940cb59d63 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Mon, 24 Jan 2022 11:50:00 +0100 Subject: [PATCH] [tuleap26948] : fix of Dump study does not work after study reopening --- src/SMESH_I/SMESH_Gen_Session_i.cxx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/SMESH_I/SMESH_Gen_Session_i.cxx b/src/SMESH_I/SMESH_Gen_Session_i.cxx index f2577d7fe..de34b3814 100644 --- a/src/SMESH_I/SMESH_Gen_Session_i.cxx +++ b/src/SMESH_I/SMESH_Gen_Session_i.cxx @@ -49,6 +49,8 @@ SALOME_ModuleCatalog::ModuleCatalog_var SMESH_Gen_Session_i::getModuleCatalog() return aCat; } +#include "SMESH_Gen_No_Session_i.hxx" + extern "C" { SMESH_I_EXPORT PortableServer::ObjectId* SMESHEngine_factory( CORBA::ORB_ptr orb, @@ -57,7 +59,17 @@ extern "C" const char* instanceName, const char* interfaceName ) { - SMESH_Gen_Session_i* aSMESHGen = new SMESH_Gen_Session_i(orb, poa, contId, instanceName, interfaceName); - return aSMESHGen->getId() ; + CORBA::Object_var o = poa->id_to_reference(*contId); + Engines::Container_var cont = Engines::Container::_narrow(o); + if(cont->is_SSL_mode()) + { + SMESH_Gen_No_Session_i* aSMESHGen = new SMESH_Gen_No_Session_i(orb, poa, contId, instanceName, interfaceName); + return aSMESHGen->getId() ; + } + else + { + SMESH_Gen_Session_i* aSMESHGen = new SMESH_Gen_Session_i(orb, poa, contId, instanceName, interfaceName); + return aSMESHGen->getId() ; + } } } -- 2.39.2