From b881fcba01a7fad8d961875ad7d591b307b717d5 Mon Sep 17 00:00:00 2001
From: Gerardo Ganis <Gerardo.Ganis@cern.ch>
Date: Mon, 19 May 2008 14:23:46 +0000
Subject: [PATCH] Fix a bug in validating elements in multi-master scenarios
git-svn-id: http://root.cern.ch/svn/root/trunk@23906 27541ba8-7e3a-0410-8455-c3a389f83636
---
proof/proof/src/TDSet.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/proof/proof/src/TDSet.cxx b/proof/proof/src/TDSet.cxx
index b8268e96955..028d1bcc927 100644
--- a/proof/proof/src/TDSet.cxx
+++ b/proof/proof/src/TDSet.cxx
@@ -247,10 +247,9 @@ void TDSetElement::Validate(TDSetElement *elem)
return;
}
- const char *name = TUrl(GetFileName()).GetFileAndOptions();
- const char *elemname = TUrl(elem->GetFileName()).GetFileAndOptions();
-
- if (!strcmp(name, elemname) &&
+ TString name = TUrl(GetFileName()).GetFileAndOptions();
+ TString elemname = TUrl(elem->GetFileName()).GetFileAndOptions();
+ if ((name == elemname) &&
!strcmp(GetDirectory(), elem->GetDirectory()) &&
!strcmp(GetObjName(), elem->GetObjName())) {
Long64_t entries = elem->fFirst + elem->fNum;
--
GitLab