From 447fd9c2368a787be688f9dee89314c2bf389230 Mon Sep 17 00:00:00 2001
From: Gerardo Ganis <Gerardo.Ganis@cern.ch>
Date: Thu, 9 Dec 2010 11:56:10 +0000
Subject: [PATCH] Fix two issues find by coverity
git-svn-id: http://root.cern.ch/svn/root/trunk@37432 27541ba8-7e3a-0410-8455-c3a389f83636
---
proof/proof/src/TProof.cxx | 2 +-
proof/proof/src/TProofServ.cxx | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/proof/proof/src/TProof.cxx b/proof/proof/src/TProof.cxx
index 72aad9659d7..e7627a6b81d 100644
--- a/proof/proof/src/TProof.cxx
+++ b/proof/proof/src/TProof.cxx
@@ -2937,7 +2937,7 @@ Int_t TProof::HandleInputMessage(TSlave *sl, TMessage *mess, Bool_t deactonfail)
TObject *xo = 0;
TIter nxin(fPlayer->GetInputList());
while ((xo = nxin()))
- if (!pq->GetInputList()->FindObject(o->GetName())) pq->AddInput(o->Clone());
+ if (!pq->GetInputList()->FindObject(xo->GetName())) pq->AddInput(xo->Clone());
// If the last object, notify the GUI that the result arrived
QueryResultReady(Form("%s:%s", pq->GetTitle(), pq->GetName()));
// Processing is over
diff --git a/proof/proof/src/TProofServ.cxx b/proof/proof/src/TProofServ.cxx
index 45990d87dd9..97ea205bfed 100644
--- a/proof/proof/src/TProofServ.cxx
+++ b/proof/proof/src/TProofServ.cxx
@@ -4127,13 +4127,11 @@ void TProofServ::ProcessNext(TString *slb)
// Send back the results
TQueryResult *pqr = pq->CloneInfo();
// At least the TDSet name in the light object
- if (dset) {
- Info("ProcessNext", "adding info about dataset '%s' in the light query result", dset->GetName());
- TList rin;
- TDSet *ds = new TDSet(dset->GetName(), dset->GetObjName());
- rin.Add(ds);
- pqr->SetInputList(&rin, kTRUE);
- }
+ Info("ProcessNext", "adding info about dataset '%s' in the light query result", dset->GetName());
+ TList rin;
+ TDSet *ds = new TDSet(dset->GetName(), dset->GetObjName());
+ rin.Add(ds);
+ pqr->SetInputList(&rin, kTRUE);
if (fPlayer->GetExitStatus() != TVirtualProofPlayer::kAborted && fPlayer->GetOutputList()) {
PDB(kGlobal, 2)
Info("ProcessNext", "sending results");
--
GitLab