From e266501b1f8b4c9b921fa3b4eaecaa31d4162a10 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 28 Jun 2006 20:07:52 +0000
Subject: [PATCH] In TFileMerger::Cp do not use the write cache since the
 function is already transferring large blocks. This function cannot work with
 the cache.

git-svn-id: http://root.cern.ch/svn/root/trunk@15605 27541ba8-7e3a-0410-8455-c3a389f83636
---
 proof/src/TFileMerger.cxx       | 3 ++-
 proofplayer/src/TFileMerger.cxx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/proof/src/TFileMerger.cxx b/proof/src/TFileMerger.cxx
index afb87cf4bf1..312acd2cf31 100644
--- a/proof/src/TFileMerger.cxx
+++ b/proof/src/TFileMerger.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name:  $:$Id: TFileMerger.cxx,v 1.6 2006/05/15 09:45:03 brun Exp $
+// @(#)root/proof:$Name:  $:$Id: TFileMerger.cxx,v 1.7 2006/05/30 12:00:41 brun Exp $
 // Author: Andreas Peters + Fons Rademakers   26/5/2005
 
 /*************************************************************************
@@ -131,6 +131,7 @@ Bool_t TFileMerger::Cp(const char *src, const char *dst, Bool_t progressbar,
       goto copyout;
    }
 
+   dfile->SetCacheWrite(0);
    sfile->Seek(0);
    dfile->Seek(0);
 
diff --git a/proofplayer/src/TFileMerger.cxx b/proofplayer/src/TFileMerger.cxx
index afb87cf4bf1..312acd2cf31 100644
--- a/proofplayer/src/TFileMerger.cxx
+++ b/proofplayer/src/TFileMerger.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name:  $:$Id: TFileMerger.cxx,v 1.6 2006/05/15 09:45:03 brun Exp $
+// @(#)root/proof:$Name:  $:$Id: TFileMerger.cxx,v 1.7 2006/05/30 12:00:41 brun Exp $
 // Author: Andreas Peters + Fons Rademakers   26/5/2005
 
 /*************************************************************************
@@ -131,6 +131,7 @@ Bool_t TFileMerger::Cp(const char *src, const char *dst, Bool_t progressbar,
       goto copyout;
    }
 
+   dfile->SetCacheWrite(0);
    sfile->Seek(0);
    dfile->Seek(0);
 
-- 
GitLab