Repository: trafficserver Updated Branches: refs/heads/master df1683d8a -> 9be03cfbf
TS-4190 Fix potential null reference found by clang-analyzaer. This closes #482 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9be03cfb Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9be03cfb Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9be03cfb Branch: refs/heads/master Commit: 9be03cfbf92b058ea0a160027b35d0879695ae59 Parents: df1683d Author: John J. Rushford <[email protected]> Authored: Tue Feb 16 18:28:31 2016 +0000 Committer: Leif Hedstrom <[email protected]> Committed: Tue Feb 16 11:37:44 2016 -0700 ---------------------------------------------------------------------- proxy/ParentConsistentHash.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9be03cfb/proxy/ParentConsistentHash.cc ---------------------------------------------------------------------- diff --git a/proxy/ParentConsistentHash.cc b/proxy/ParentConsistentHash.cc index 2b41831..6233bdc 100644 --- a/proxy/ParentConsistentHash.cc +++ b/proxy/ParentConsistentHash.cc @@ -196,7 +196,7 @@ ParentConsistentHash::selectParent(const ParentSelectionPolicy *policy, bool fir } // use the available or marked for retry parent. - if ((pRec && pRec->available) || result->retry) { + if (pRec && (pRec->available || result->retry)) { result->r = PARENT_SPECIFIED; result->hostname = pRec->hostname; result->port = pRec->port;
