Commit 347120d7 authored by Marco Clemencic's avatar Marco Clemencic

Merge branch 'LHCBPS-1850'

Make sure the TES is cleaned by EventLoopMgr before finalize

Closes LHCBPS-1850

See merge request !1082
parents 0c97c693 a8c78412
Pipeline #1728283 passed with stages
in 19 minutes and 22 seconds
......@@ -172,7 +172,10 @@ StatusCode EventLoopMgr::stop() {
m_incidentSvc->fireIncident( Incident( name(), IncidentType::EndEvent ) );
m_endEventFired = true;
}
return MinimalEventLoopMgr::stop();
return m_evtDataMgrSvc
->clearStore() //
.andThen( [this]() { return MinimalEventLoopMgr::stop(); } ) //
.orElse( [this]() { DEBMSG << "Clear of Event data store failed" << endmsg; } );
}
//--------------------------------------------------------------------------------------------
......
......@@ -109,8 +109,7 @@ StatusCode DataSvc::clearSubTree( DataObject* pObject ) {
/// IDataManagerSvc: Remove all data objects in the data store.
StatusCode DataSvc::clearStore() {
if ( !checkRoot() ) return Status::INVALID_ROOT;
m_root.reset();
if ( checkRoot() ) m_root.reset();
return StatusCode::SUCCESS;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment