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

Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Jason Brown 2017-08-29 08:22:16 -07:00
parent 826ae9c91e 82d684080d
commit 35dc3b652f
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

@ -896,8 +896,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));