Merge branch 'gaudi82.DetDescrCnvSvc-20210917' into 'master'

DetDescrCnvSvc: Work around Gaudi init problem.

See merge request atlas/athena!46585

DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 // Include files
@@ -122,6 +122,15 @@ DetDescrCnvSvc::initialize()     {
 	log << MSG::INFO << "Found DetectorStore service" << endmsg;
     }
 
+    // Working around Gaudi Issue https://gitlab.cern.ch/gaudi/Gaudi/issues/82
+    if (m_detStore->FSMState() < Gaudi::StateMachine::INITIALIZED) {
+      log << MSG::INFO << "Explicitly initializing DetDescrCnvSvc" << endmsg;
+      if (m_detStore->sysInitialize().isFailure()) {
+	log << MSG::FATAL << "Error initializing DetectorStore !" << endmsg;
+	return StatusCode::FAILURE;
+      }
+    } 
+
     // fill in the Addresses for Transient Detector Store objects
 
     log << MSG::INFO << " filling proxies for detector managers " <<endmsg ;