From 04b1f91f397cf34f7b9a78ba07bbf9b8bb83204a Mon Sep 17 00:00:00 2001
From: Charles Leggett <leggett@cern.ch>
Date: Fri, 16 Jun 2017 11:00:02 +0200
Subject: [PATCH] check if thread local EventContext has extension before
trying to extract proxy
Former-commit-id: bcaf734d92c62a230df61ecdca22d6d91d6ab7cc
---
Control/StoreGate/src/VarHandleBase.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Control/StoreGate/src/VarHandleBase.cxx b/Control/StoreGate/src/VarHandleBase.cxx
index e8233cdb8b6..ad48030773f 100644
--- a/Control/StoreGate/src/VarHandleBase.cxx
+++ b/Control/StoreGate/src/VarHandleBase.cxx
@@ -881,7 +881,8 @@ namespace SG {
if (ctx)
return ctx->getExtension<Atlas::ExtendedEventContext>()->proxy();
if (m_storeWasSet && m_store) return m_store;
- return Gaudi::Hive::currentContext().getExtension<Atlas::ExtendedEventContext>()->proxy();
+ const Atlas::ExtendedEventContext *eec = Gaudi::Hive::currentContext().getExtension<Atlas::ExtendedEventContext>();
+ return ( (eec == nullptr) ? nullptr : eec->proxy() );
}
if (m_storeWasSet && m_store) return m_store;
--
GitLab