Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a3498d5eb -> 6b927783b refs/heads/cassandra-2.2 c6dec2f0e -> 4b52a6860 refs/heads/cassandra-3.11 826ae9c91 -> 35dc3b652 refs/heads/trunk 278906c6c -> 6e395dd3b
followup to CASSANDRA-13700; minor cleanup Patch by jasobrown; reviewed by Joel Knighton for CASSANDRA-13700 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b927783 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b927783 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b927783 Branch: refs/heads/cassandra-2.1 Commit: 6b927783ba0777d3dd7c2c3311b246a8dbce5b59 Parents: a3498d5 Author: Jason Brown <jasedbr...@gmail.com> Authored: Tue Aug 29 07:52:40 2017 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Aug 29 07:52:40 2017 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b927783/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index 7c37917..d3db37f 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -860,8 +860,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean * than the version passed in. In this case we also send the old * heart beat and throw it away on the receiver if it is redundant. */ - int localHbGeneration = epState.getHeartBeatState().getGeneration(); - int localHbVersion = epState.getHeartBeatState().getHeartBeatVersion(); + HeartBeatState heartBeatState = epState.getHeartBeatState(); + int localHbGeneration = heartBeatState.getGeneration(); + int localHbVersion = heartBeatState.getHeartBeatVersion(); if (localHbVersion > version) { reqdEndpointState = new EndpointState(new HeartBeatState(localHbGeneration, localHbVersion)); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org