natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.2' into cassandra-3.0

This commit is contained in:
Jason Brown 2017-08-29 08:28:09 -07:00
parent a7cb009f8a 4b52a68604
commit e817c83bc0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/org/apache/cassandra/gms/Gossiper.java
View File

@ -871,8 +871,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
* than the version passed in. In this case we also send the old * 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. * heart beat and throw it away on the receiver if it is redundant.
*/ */
int localHbGeneration = epState.getHeartBeatState().getGeneration(); HeartBeatState heartBeatState = epState.getHeartBeatState();
int localHbVersion = epState.getHeartBeatState().getHeartBeatVersion(); int localHbGeneration = heartBeatState.getGeneration();
int localHbVersion = heartBeatState.getHeartBeatVersion();
if (localHbVersion > version) if (localHbVersion > version)
{ {
reqdEndpointState = new EndpointState(new HeartBeatState(localHbGeneration, localHbVersion)); reqdEndpointState = new EndpointState(new HeartBeatState(localHbGeneration, localHbVersion));