From cec3943f0747cb3ce1e0a6d37772f0c4abf7b377 Mon Sep 17 00:00:00 2001
From: Maciej Szymanski <maciej.szymanski@cern.ch>
Date: Wed, 22 Nov 2023 14:07:49 +0100
Subject: [PATCH] (partial) revert of 0f18b1bec43712b3882959513394bc7e3931630b
See https://gitlab.cern.ch/atlas/athena/-/merge_requests/64530#note_7325220 for context.
0f18b1bec43712b3882959513394bc7e3931630b seems to contains two parts:
- file name manipulations in AthenaPoolCnvSvc
- move of setting the address from T_AthenaPoolCoolMultChanCnv and AthenaPoolConverter to AthenaOutputStreamTool
This commit reverts only the latter, but restoring the `setAddress` only in T_AthenaPoolCoolMultChanCnv, as having it in AthenaPoolConverter leads to crashes.
---
Control/AthenaServices/src/AthenaOutputStreamTool.cxx | 1 -
.../AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.icc | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/Control/AthenaServices/src/AthenaOutputStreamTool.cxx b/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
index 453230bf68ee..c620d3d7b1db 100644
--- a/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
@@ -473,7 +473,6 @@ StatusCode AthenaOutputStreamTool::streamObjects(const DataObjectVec& dataObject
if (dobj->clID() != 1 || addr->par()[0] != "\n") {
if (dobj->clID() != ClassID_traits<DataHeader>::ID()) {
m_dataHeader->insert(proxy, addr);
- if (m_store->storeID() != StoreID::EVENT_STORE) proxy->setAddress(addr);
} else {
m_dataHeader->insert(proxy, addr, m_processTag);
}
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.icc b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.icc
index 94bce3ad0dd6..a3df5cff2706 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.icc
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.icc
@@ -225,6 +225,7 @@ StatusCode T_AthenaPoolCoolMultChanCnv<COLL_T, ELEM_T, ELEM_P>::createRep(DataOb
token->toString());
addr->setAttrListColl(coll);
delete pAddr; pAddr = addr;
+ pObj->registry()->setAddress(pAddr);
delete token; token = 0;
ATH_MSG_DEBUG("End createRep");
--
GitLab