Skip to content
Snippets Groups Projects
Commit db93dd1d authored by Tadej Novak's avatar Tadej Novak
Browse files

Merge branch 'propagate.RootAuxDynStore.readData.errors' into 'main'

Do not ignore error code returned by RootAuxDynStore::readData() ATEAM-1038

Closes ATEAM-1038

See merge request !76537
parents aa0a93cb c168661e
No related branches found
No related tags found
6 merge requests!77731Draft: Updates to ZDC reconstruction,!77728Draft: updates to ZDC reconstruction,!77522Draft: sTGC Pad Trigger Emulator,!76725ZdcNtuple: Fix cppcheck warning.,!76611L1CaloFEXByteStream: Fix out-of-bounds array accesses.,!76537Do not ignore error code returned by RootAuxDynStore::readData() ATEAM-1038
......@@ -39,8 +39,9 @@ const SG::IAuxTypeVector* RootAuxDynStore::getVector(SG::auxid_t auxid) const
const SG::IAuxTypeVector* ret = SG::AuxStoreInternal::getVector (auxid);
if (!ret) {
auto this_nc ATLAS_THREAD_SAFE = const_cast<RootAuxDynStore*>(this); // locked above
this_nc->readData(auxid);
ret = SG::AuxStoreInternal::getVector (auxid);
if( this_nc->readData(auxid) ) {
ret = SG::AuxStoreInternal::getVector (auxid);
}
}
return ret;
}
......@@ -59,8 +60,9 @@ const void* RootAuxDynStore::getIOData(SG::auxid_t auxid) const
const void* ret = SG::AuxStoreInternal::getIODataInternal (auxid, true);
if (!ret) {
auto this_nc ATLAS_THREAD_SAFE = const_cast<RootAuxDynStore*>(this); // locked above
this_nc->readData(auxid);
ret = SG::AuxStoreInternal::getIOData (auxid);
if( this_nc->readData(auxid) ) {
ret = SG::AuxStoreInternal::getIOData (auxid);
}
}
return ret;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment