Additional fix for #88417: Request to commit/port fixes to ANALYSIS/AliFileMerger...

diff --git a/ANALYSIS/AliFileMerger.cxx b/ANALYSIS/AliFileMerger.cxx
index d46e4e819cad8774fde3499fa08475f6bee75c3c..e78e97f664ff5bdd294957d1851a94085a75dd80 100644 (file)
--- a/ANALYSIS/AliFileMerger.cxx
+++ b/ANALYSIS/AliFileMerger.cxx
@@ -436,7 +436,12 @@ int AliFileMerger::MergeRootfile( TDirectory *target, TList *sourcelist)
       //current_sourcedir->cd();
 
       TObject *obj = key->ReadObj();
       //current_sourcedir->cd();
 
       TObject *obj = key->ReadObj();

-      
+      if (!obj) {
+       cout << "Failed to get the object with key " << key->GetName() << " from " << 
+         current_sourcedir->GetFile()->GetName() << "/" << current_sourcedir->GetName() << endl;
+       continue;
+      }
+

       if ( obj->IsA()->InheritsFrom( TTree::Class() ) ) {
        
        // loop over all source files create a chain of Trees "globChain"
       if ( obj->IsA()->InheritsFrom( TTree::Class() ) ) {
        
        // loop over all source files create a chain of Trees "globChain"


@@ -499,6 +504,12 @@ int AliFileMerger::MergeRootfile( TDirectory *target, TList *sourcelist)
            TKey *key2 = (TKey*)gDirectory->GetListOfKeys()->FindObject(key->GetName());
            if (key2) {
              TObject *hobj = key2->ReadObj();
            TKey *key2 = (TKey*)gDirectory->GetListOfKeys()->FindObject(key->GetName());
            if (key2) {
              TObject *hobj = key2->ReadObj();

+             if (!hobj) {
+               cout << "Failed to get the object with key " << key2->GetName() << " from " << 
+                 ndir->GetFile()->GetName() << "/" << ndir->GetName() << endl;
+               continue;
+             }
+             //

              hobj->ResetBit(kMustCleanup);
              listH.Add(hobj);
              Int_t error = 0;
              hobj->ResetBit(kMustCleanup);
              listH.Add(hobj);
              Int_t error = 0;