From: Anthony Geay Date: Mon, 15 Jan 2018 12:34:31 +0000 (+0100) Subject: A missing method giveADataScopeTransactionCalled 4 RequestSwitcherDSM X-Git-Tag: EMC2_V_1_0_2~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=545f64b1f103a3c61822441d57a565ee1eef0de1;p=modules%2Fkernel.git A missing method giveADataScopeTransactionCalled 4 RequestSwitcherDSM --- diff --git a/idl/SALOME_SDS.idl b/idl/SALOME_SDS.idl index 4330f2fb7..1b28d5610 100644 --- a/idl/SALOME_SDS.idl +++ b/idl/SALOME_SDS.idl @@ -85,9 +85,12 @@ module SALOME void fetchAndGetAccessOfVar(in string varName, out string access, out ByteVec data) raises (SALOME::SALOME_Exception); }; + interface DataScopeServerTransaction; + interface RequestSwitcherDSM : RequestSwitcherBase { StringVec listScopes(); + DataScopeServerTransaction giveADataScopeTransactionCalled(in string scopeName, out boolean isCreated) raises (SALOME::SALOME_Exception); }; interface DataScopeServerBase diff --git a/src/SALOMESDS/SALOMESDS_DataServerManager.cxx b/src/SALOMESDS/SALOMESDS_DataServerManager.cxx index 5c93fb111..9266e17f6 100644 --- a/src/SALOMESDS/SALOMESDS_DataServerManager.cxx +++ b/src/SALOMESDS/SALOMESDS_DataServerManager.cxx @@ -38,6 +38,11 @@ SALOME::StringVec *RequestSwitcherDSM::listScopes() return _dsm->listScopes(); } +SALOME::DataScopeServerTransaction_ptr RequestSwitcherDSM::giveADataScopeTransactionCalled(const char *scopeName, CORBA::Boolean& isCreated) +{ + return _dsm->giveADataScopeTransactionCalled(scopeName,isCreated); +} + DataServerManager::DataServerManager(int argc, char *argv[], CORBA::ORB_ptr orb, PortableServer::POA_ptr poa):_orb(CORBA::ORB::_duplicate(orb)) { DataScopeServer *dftScope(new DataScopeServer(orb,SALOME::DataScopeKiller::_nil(),DFT_SCOPE_NAME_IN_NS));//_remove_ref will be call by DataScopeServer::shutdownIfNotHostedByDSM diff --git a/src/SALOMESDS/SALOMESDS_DataServerManager.hxx b/src/SALOMESDS/SALOMESDS_DataServerManager.hxx index e8ffa1ede..835a6e882 100644 --- a/src/SALOMESDS/SALOMESDS_DataServerManager.hxx +++ b/src/SALOMESDS/SALOMESDS_DataServerManager.hxx @@ -43,6 +43,7 @@ namespace SALOMESDS public: RequestSwitcherDSM(CORBA::ORB_ptr orb, DataServerManager *dsm):RequestSwitcherBase(orb),_dsm(dsm) { } SALOME::StringVec *listScopes(); + SALOME::DataScopeServerTransaction_ptr giveADataScopeTransactionCalled(const char *scopeName, CORBA::Boolean& isCreated); private: DataServerManager *_dsm; };