Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #1617

This commit is contained in:
Justin Bertram 2017-10-27 08:45:02 -05:00
parent 9a5a3d496d 84fb07be53
commit 6d8e89df9c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
View File

@ -202,7 +202,7 @@ public final class Topology {
sendMemberUp(nodeId, memberInput);
return true;
}
if (uniqueEventID > currentMember.getUniqueEventID()) {
if (uniqueEventID > currentMember.getUniqueEventID() || (currentMember.getLive() == null && memberInput.getLive() != null)) {
TopologyMemberImpl newMember = new TopologyMemberImpl(nodeId, memberInput.getBackupGroupName(), memberInput.getScaleDownGroupName(), memberInput.getLive(), memberInput.getBackup());
if (newMember.getLive() == null && currentMember.getLive() != null) {
@ -219,7 +219,12 @@ public final class Topology {
newMember, new Exception("trace"));
}
newMember.setUniqueEventID(uniqueEventID);
if (uniqueEventID > currentMember.getUniqueEventID()) {
newMember.setUniqueEventID(uniqueEventID);
} else {
newMember.setUniqueEventID(currentMember.getUniqueEventID());
}
topology.remove(nodeId);
topology.put(nodeId, newMember);
sendMemberUp(nodeId, newMember);