Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-77 f3034be68 -> 2561cf157
GEODE-77: view received with no failure detection info JoinLeave was sending a view with no failure detection ports set if it created a new view due to additional failed members being detected during preparation or due to a conflicting prepared-view being received Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2561cf15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2561cf15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2561cf15 Branch: refs/heads/feature/GEODE-77 Commit: 2561cf157f93fa66eb4a3dd63cd30f9f73fa8620 Parents: f3034be Author: Bruce Schuchardt <[email protected]> Authored: Thu Nov 5 11:10:35 2015 -0800 Committer: Bruce Schuchardt <[email protected]> Committed: Thu Nov 5 11:10:35 2015 -0800 ---------------------------------------------------------------------- .../internal/membership/gms/membership/GMSJoinLeave.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2561cf15/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java index ed5535f..bf81d76 100755 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java @@ -1969,10 +1969,11 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler { removalReqs.addAll(failures); List<InternalDistributedMember> newMembers = new ArrayList<>(newView.getMembers()); newMembers.removeAll(removalReqs); - NetView nextView = new NetView(localAddress, newView.getViewId() + 1, newMembers, leaveReqs, removalReqs); + NetView tempView = new NetView(localAddress, newView.getViewId() + 1, newMembers, leaveReqs, removalReqs); for (InternalDistributedMember mbr: newView.getMembers()) { - nextView.setFailureDetectionPort(mbr, newView.getFailureDetectionPort(mbr)); + tempView.setFailureDetectionPort(mbr, newView.getFailureDetectionPort(mbr)); } + newView = tempView; int size = failures.size(); List<String> reasons = new ArrayList<>(size); for (int i=0; i<size; i++) {
