From b046cb563fdd6aa961cef67057a7cb78f017237e Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Thu, 21 Sep 2017 17:15:27 +0200
Subject: [PATCH] Fixed silly dereferencing of known nullptr
---
catalogue/OracleCatalogue.cpp | 2 +-
catalogue/SqliteCatalogue.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalogue/OracleCatalogue.cpp b/catalogue/OracleCatalogue.cpp
index d82b0d98de..db256f5c7a 100644
--- a/catalogue/OracleCatalogue.cpp
+++ b/catalogue/OracleCatalogue.cpp
@@ -139,7 +139,7 @@ void OracleCatalogue::deleteArchiveFile(const std::string &diskInstanceName, con
if(nullptr == archiveFile.get()) {
log::ScopedParamContainer spc(lc);
- spc.add("fileId", std::to_string(archiveFile->archiveFileID));
+ spc.add("fileId", archiveFileId);
lc.log(log::WARNING, "Ignoring request to delete archive file because it does not exist in the catalogue");
return;
}
diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp
index 8a8a55d285..d60cd97c9f 100644
--- a/catalogue/SqliteCatalogue.cpp
+++ b/catalogue/SqliteCatalogue.cpp
@@ -68,7 +68,7 @@ void SqliteCatalogue::deleteArchiveFile(const std::string &diskInstanceName, con
if(nullptr == archiveFile.get()) {
log::ScopedParamContainer spc(lc);
- spc.add("fileId", std::to_string(archiveFile->archiveFileID));
+ spc.add("fileId", archiveFileId);
lc.log(log::WARNING, "Ignoring request to delete archive file because it does not exist in the catalogue");
return;
}
--
GitLab