AliceO2Group
diff --git a/‎CCDB/include/CCDB/BasicCCDBManager.h‎
Lines changed: 2 additions & 2 deletions b/‎CCDB/include/CCDB/BasicCCDBManager.h‎
Lines changed: 2 additions & 2 deletions
@@ -147,8 +147,7 @@ class CCDBManagerInstance
     if (!isCachingEnabled()) {
       return false;
     }
-    return mCache[path].isCacheValid(timestamp); // use stricter check
-    //    return mCache[path].isValid(timestamp);
+    return (mCheckObjValidityEnabled && mCache[path].isValid(timestamp)) || mCache[path].isCacheValid(timestamp); // use stricter check
   }
 
   /// check if checks of object validity before CCDB query is enabled
@@ -264,6 +263,7 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp)
         cached.objPtr.reset(ptr);
       }
       cached.uuid = mHeaders["ETag"];
+
       try {
         if (mHeaders.find("Valid-From") != mHeaders.end()) {
           cached.startvalidity = std::stol(mHeaders["Valid-From"]);
Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,7 @@ class CCDBManagerInstance`
`147`	`147`	`if (!isCachingEnabled()) {`
`148`	`148`	`return false;`
`149`	`149`	`}`
`150`		`- return mCache[path].isCacheValid(timestamp); // use stricter check`
`151`		`- // return mCache[path].isValid(timestamp);`
	`150`	`+ return (mCheckObjValidityEnabled && mCache[path].isValid(timestamp)) \|\| mCache[path].isCacheValid(timestamp); // use stricter check`
`152`	`151`	`}`
`153`	`152`
`154`	`153`	`/// check if checks of object validity before CCDB query is enabled`
`@@ -264,6 +263,7 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp)`
`264`	`263`	`cached.objPtr.reset(ptr);`
`265`	`264`	`}`
`266`	`265`	`cached.uuid = mHeaders["ETag"];`
	`266`	`+`
`267`	`267`	`try {`
`268`	`268`	`if (mHeaders.find("Valid-From") != mHeaders.end()) {`
`269`	`269`	`cached.startvalidity = std::stol(mHeaders["Valid-From"]);`