Skip to content

Commit 5f7a23f

Browse files
committed
hadd: Remove inadvertent deletion (and subsequent re-reading) of TDirectory.
This fixes issue #9939. The mechanism introduced in commits e97dc36 and 30fd4c7 : TFileMerger delete directory only if we induced its creation/loading also had the unforunate consequence leading to the deletion of the TDirectory object when reading other objects, leading to the need to re-read the TDirectory objects as many time as object in the directory ... (This is triggered only for the 2nd and higher files).
1 parent dd6570b commit 5f7a23f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

io/io/src/TFileMerger.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ Bool_t TFileMerger::MergeOne(TDirectory *target, TList *sourcelist, Int_t type,
800800
}
801801
}
802802
info.Reset();
803-
803+
dirtodelete.Clear("nodelete"); // If needed the delete is done explicitly above.
804804
return kTRUE;
805805
}
806806

0 commit comments

Comments
 (0)