Merge branch 'WriteDecorHandleFix' into '23.0'

ReadDecorHandleKey: Fix for updated parent container name.

See merge request !64173

Control/StoreGate/StoreGate/ReadDecorHandleKey.icc

@@ -177,8 +177,11 @@ template <class T>
 StatusCode ReadDecorHandleKey<T>::initialize (bool used /*= true*/)
 {
   // If a parent container is used, its key may have changed
-  if (m_contKey)
+  if (m_contKey){
     m_contHandleKey = m_contKey->key();
+    std::string decorKey=decorKeyFromKey(this->key());
+    VarHandleKey::operator=(makeContDecorKey (m_contKey->key(), decorKey));
+  }
 
   if (m_contHandleKey.initialize (used).isFailure())
     return StatusCode::FAILURE;

Control/StoreGate/test/ReadDecorHandleKey_test.cxx

@@ -73,6 +73,14 @@ void test1()
     SG::ReadDecorHandleKey<MyObj> k (&owner, "CCCKey", r, "dec", "doc string");
     check(owner, k);
   }
+  {
+    TestOwner owner;
+    SG::ReadHandleKey<MyObj> w ("xxx");
+    SG::ReadDecorHandleKey<MyObj> k (&owner, "CCCKey", w, "dec", "doc string");
+    w="ccc";
+    k.initialize().ignore();
+    check(owner, k);
+  }
 }
 
 

Control/StoreGate/test/WriteDecorHandleKey_test.cxx

@@ -107,6 +107,7 @@ void test1()
   auto check = [](TestOwner& owner, SG::WriteDecorHandleKey<MyObj>& k) {
     assert (k.clid() == 293847295);
     assert (k.key() == "ccc.dec");
+    //assert (k.objKey() == "ccc.dec");
     assert (k.mode() == Gaudi::DataHandle::Writer);
     assert (k.contHandleKey().clid() == 293847295);
     assert (k.contHandleKey().key() == "ccc");
@@ -129,6 +130,15 @@ void test1()
     check(owner, k);
   }
 
+  {
+    TestOwner owner;
+    SG::WriteHandleKey<MyObj> w ("xxx");
+    SG::WriteDecorHandleKey<MyObj> k (&owner, "CCCKey", w, "dec", "doc string");
+    w="ccc";
+    k.initialize().ignore();
+    check(owner, k);
+  }
+
 }