From 96435124fc436911c7f5f4339eb2391f29072076 Mon Sep 17 00:00:00 2001
From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 4 Jan 2011 10:41:58 +0000
Subject: [PATCH] Fix for inproper merging of some components. (M. Ivanov)

---
 ANALYSIS/AliFileMerger.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ANALYSIS/AliFileMerger.cxx b/ANALYSIS/AliFileMerger.cxx
index 11b76b60b68..03a00d7db83 100644
--- a/ANALYSIS/AliFileMerger.cxx
+++ b/ANALYSIS/AliFileMerger.cxx
@@ -163,7 +163,7 @@ void AliFileMerger::IterTXT( const char * fileList,  const char* outputFileName,
   else {
     StoreResults(mergeArray, outputFileName);
   }
-
+  
   delete mergeArray;
 }
 
@@ -202,6 +202,7 @@ void AliFileMerger::Merge(TFile* fileIn, TObjArray * array){
   //
   // Merging procedure
   //
+  if (!array) return;
   static Int_t counter=-1;
   counter++;
   TObjArray *carray = new TObjArray;   //array of the objects inside current file
@@ -228,8 +229,8 @@ void AliFileMerger::Merge(TFile* fileIn, TObjArray * array){
     return;
   }
   TMethodCall callEnv;
-  
-  for (Int_t i=0; i<carray->GetEntries(); i++){
+  Int_t entries =carray->GetEntriesFast();
+  for (Int_t i=0; i<entries; i++){
     
     TObjArray *templist = new TObjArray(1);
     templist->SetOwner(kFALSE);
@@ -258,6 +259,7 @@ void AliFileMerger::Merge(TFile* fileIn, TObjArray * array){
     AliSysInfo::AddStamp(currentObject->GetName(),2,i,counter);  
     delete templist;
   }
+  carray->Delete();
   delete carray;
 }
 
-- 
2.43.0