Commit 6682b9f7 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'AthenaIO_SharedWriterIncidentFix2' into 'master'

Fix needed as shared memory segments may have names "SHM" + client number.

See merge request !24314
parents b9f9897c 71c0630b
......@@ -560,7 +560,7 @@ StatusCode MetaDataSvc::initInputMetaDataStore(const std::string& fileName) {
}
if (fileName.find("BSF:") == 0) {
ATH_MSG_DEBUG("MetaDataSvc called for non ROOT file.");
} else if (fileName == "SHM") {
} else if (fileName.substr(0, 3) == "SHM") {
ATH_MSG_DEBUG("MetaDataSvc called for shared memory.");
} else {
const std::string par[2] = { fileName, m_metaDataCont.value() + "(DataHeader)" };
......
......@@ -911,7 +911,7 @@ StatusCode AthenaPoolCnvSvc::createAddress(long svcType,
return(StatusCode::FAILURE);
}
Token* token = nullptr;
if (par[0] == "SHM") {
if (par[0].substr(0, 3) == "SHM") {
token = new Token();
token->setOid(Token::OID_t(ip[0], ip[1]));
token->setAuxString("[PNAME=" + par[2] + "]");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment