Coverity fix

[u/mrichter/AliRoot.git] / STEER / AliCDBStorage.cxx

diff --git a/STEER/AliCDBStorage.cxx b/STEER/AliCDBStorage.cxx
index 16283e4d30cbf686df179803068731696334f882..9112ec6911b96e2802fbe64d77e40ae1d53f5b8c 100644 (file)
--- a/STEER/AliCDBStorage.cxx
+++ b/STEER/AliCDBStorage.cxx
@@ -233,8 +233,15 @@ AliCDBEntry* AliCDBStorage::Get(const AliCDBId& query) {
                        AliDebug(2, Form("CDB object retrieved: %s", entry->GetId().ToString().Data()));
        } else {
                // this is to make the SHUTTLE output lighter
-               if(!(query.GetPath().Contains("SHUTTLE/STATUS")))
-                       AliInfo(Form("No valid CDB object found! request was: %s", query.ToString().Data()));
+               if(!(query.GetPath().Contains("SHUTTLE/STATUS"))){
+
+                       if(!(query.GetPath().Contains("SHUTTLE"))){
+                               AliFatal(Form("No valid CDB object found! request was: %s", query.ToString().Data()));
+                       }
+                       else {
+                               AliInfo(Form("No valid CDB object found! request was: %s", query.ToString().Data()));
+                       }
+               }
        }
 
        // if drain storage is set, drain entry into drain storage
@@ -369,6 +376,11 @@ AliCDBId* AliCDBStorage::GetId(const AliCDBPath& path,
 Bool_t AliCDBStorage::Put(TObject* object, AliCDBId& id, AliCDBMetaData* metaData, AliCDBManager::DataType type) {
 // store an AliCDBEntry object into the database
        
+       if (object==0x0) {
+               AliError("Null Entry! No storage will be done!");
+               return kFALSE;
+       } 
+
        AliCDBEntry anEntry(object, id, metaData);
 
        return Put(&anEntry, type);
@@ -383,6 +395,11 @@ Bool_t AliCDBStorage::Put(AliCDBEntry* entry, AliCDBManager::DataType type) {
                return kFALSE;
        }
        
+       if (entry->GetObject()==0x0){
+               AliError("No valid object in CDB entry!");
+               return kFALSE;
+       }
+
        if (!entry->GetId().IsValid()) {
                AliError(Form("Invalid entry ID: %s",
                        entry->GetId().ToString().Data()));
@@ -404,9 +421,6 @@ Bool_t AliCDBStorage::Put(AliCDBEntry* entry, AliCDBManager::DataType type) {
                        return 0;
        }
 
-       // set object's class name into metaData!
-       entry->GetMetaData()->SetObjectClassName(entry->GetObject()->ClassName());
-
        return PutEntry(entry);
 }
 
@@ -438,7 +452,6 @@ void AliCDBStorage::QueryCDB(Int_t run, const char* pathFilter,
        if(md) fMetaDataFilter = dynamic_cast<AliCDBMetaData*> (md->Clone());
 
        QueryValidFiles();
-       AliCDBId queryId(pathFilter,run,run,version);
 
        AliInfo(Form("%d valid files found!", fValidFileIds.GetEntriesFast()));
 
@@ -488,6 +501,11 @@ void AliCDBStorage::LoadTreeFromFile(AliCDBEntry *entry) const {
 // Checks whether entry contains a TTree and in case loads it into memory
 
        TObject *obj = (TObject*) entry->GetObject();
+       if (!obj) {
+         AliError("Cannot retrieve the object:");
+         entry->PrintMetaData();
+         return;
+       }
 
        if (!strcmp(obj->ClassName(),TTree::Class_Name())) {