From 21e75fae926756cf49be2d224c2c85e6a96012b0 Mon Sep 17 00:00:00 2001
From: Peter Van Gemmeren <peter.van.gemmeren@cern.ch>
Date: Fri, 20 May 2016 20:54:38 +0200
Subject: [PATCH] DataHeaderCnv_p5 contains DataHeaderForm by pointer
 (PersistentDataModelAthenaPool-00-02-04)

	* DataHeaderCnv_p5 contain DataHeaderForm by pointer
	* tag PersistentDataModelAthenaPool-00-02-04


Former-commit-id: e027bd2cb6abe75d7717863ea395702ae5266413
---
 .../PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx b/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx
index af518ed4171..1b500b2d75a 100755
--- a/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx
+++ b/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx
@@ -61,10 +61,10 @@ StatusCode DataHeaderCnv::DataObjectToPool(DataObject* pObj, const std::string&
    }
    m_persObjList.push_back(persObj);
    this->setPlacementWithType("DataHeaderForm", tname);
-   const Token* dhf_token = m_athenaPoolCnvSvc->registerForWrite(m_placement, &persObj->dhForm(), m_mapClassDesc);
+   const Token* dhf_token = m_athenaPoolCnvSvc->registerForWrite(m_placement, persObj->dhForm(), m_mapClassDesc);
    if (dhf_token == 0) {
       MsgStream log(messageService(), "DataHeaderCnv");
-      log << MSG::FATAL << "Failed to write DataHeaderForm" << endreq;
+      log << MSG::FATAL << "Failed to write DataHeaderForm = " << persObj->dhForm() << endreq;
       return(StatusCode::FAILURE);
    }
    this->setPlacementWithType("DataHeader", tname);
@@ -139,7 +139,7 @@ DataHeader_p5* DataHeaderCnv::poolReadObject_p5() {
             throw std::runtime_error("Failed to cast object for token = " + mapToken.toString());
          }
       }
-      pObj->setDhForm(*m_dhForm);
+      pObj->setDhForm(m_dhForm);
    }
    return(pObj);
 }
-- 
GitLab