Merge branch 'LHCBPS-1850'

Make sure the TES is cleaned by EventLoopMgr before finalize

Closes LHCBPS-1850

See merge request gaudi/Gaudi!1082

GaudiCoreSvc/src/ApplicationMgr/EventLoopMgr.cpp

@@ -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; } );
 }
 
 //--------------------------------------------------------------------------------------------

GaudiKernel/src/Lib/DataSvc.cpp

@@ -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;
 }