From 771ba07c468eefce81b8a9275c0800fb972d9ca3 Mon Sep 17 00:00:00 2001
From: Matti Kortelainen <matti.kortelainen@cern.ch>
Date: Thu, 2 Jul 2020 15:54:10 +0200
Subject: [PATCH] Throw a separate exception if ESGetToken is uninitialized

---
 FWCore/Framework/interface/EventSetupRecord.h | 4 +++-
 FWCore/Framework/test/eventsetup_t.cppunit.cc | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/FWCore/Framework/interface/EventSetupRecord.h b/FWCore/Framework/interface/EventSetupRecord.h
index 7bbc1b8c90413..e797ee0da3317 100644
--- a/FWCore/Framework/interface/EventSetupRecord.h
+++ b/FWCore/Framework/interface/EventSetupRecord.h
@@ -205,10 +205,12 @@ namespace edm {
     protected:
       template <template <typename> typename H, typename T, typename R>
       H<T> getHandleImpl(ESGetToken<T, R> const& iToken) const {
+        if UNLIKELY (not iToken.isInitialized()) {
+          std::rethrow_exception(makeInvalidTokenException(this->key(), DataKey::makeTypeTag<T>()));
+        }
         if UNLIKELY (iToken.transitionID() != transitionID()) {
           throwWrongTransitionID();
         }
-        assert(iToken.isInitialized());
         assert(getTokenIndices_);
         //need to check token has valid index
         if UNLIKELY (not iToken.hasValidIndex()) {
diff --git a/FWCore/Framework/test/eventsetup_t.cppunit.cc b/FWCore/Framework/test/eventsetup_t.cppunit.cc
index 2c2eea4f02f9b..9865f97077cb7 100644
--- a/FWCore/Framework/test/eventsetup_t.cppunit.cc
+++ b/FWCore/Framework/test/eventsetup_t.cppunit.cc
@@ -588,6 +588,7 @@ namespace {
     }
 
     ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> m_token;
+    ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> m_tokenUninitialized;
   };
 
   class ConsumesProducer : public ESProducer {
@@ -763,6 +764,14 @@ void testEventsetup::getDataWithESGetTokenTest() {
                             true};
       auto const& data = eventSetup.getData(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data.value_);
+      bool uninitializedTokenThrewException = false;
+      try {
+        (void)eventSetup.getData(consumer.m_tokenUninitialized);
+      } catch (cms::Exception& ex) {
+        uninitializedTokenThrewException = true;
+        CPPUNIT_ASSERT(ex.category() == "InvalidESGetToken");
+      }
+      CPPUNIT_ASSERT(uninitializedTokenThrewException);
     }
 
     {