GEODE-990 CI Failure GMSJoinLeaveJUnitTest.testPreparedViewFoundDuringBecomeCoordinator failed with NullPointerException
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9fdcca12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9fdcca12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9fdcca12 Branch: refs/heads/feature/GEODE-949-2 Commit: 9fdcca129845a1ffa4c935146cdd04aa2af7e4e8 Parents: 374d2f4 Author: Jianxia Chen <[email protected]> Authored: Thu Mar 10 16:35:05 2016 -0800 Committer: Jianxia Chen <[email protected]> Committed: Thu Mar 10 16:35:05 2016 -0800 ---------------------------------------------------------------------- .../gms/membership/GMSJoinLeaveJUnitTest.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9fdcca12/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java index 202888c..33fa2ea 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java @@ -1015,14 +1015,20 @@ public class GMSJoinLeaveJUnitTest { Thread.sleep(2000); ViewCreator vc = gmsJoinLeave.getViewCreator(); - - ViewAckMessage vack = new ViewAckMessage(gmsJoinLeaveMemberId, gmsJoinLeave.getPreparedView().getViewId(), true); + int viewId = 0; + if (gmsJoinLeave.getPreparedView() == null) { + viewId = gmsJoinLeave.getView().getViewId(); + } + else { + viewId = gmsJoinLeave.getPreparedView().getViewId(); + } + ViewAckMessage vack = new ViewAckMessage(gmsJoinLeaveMemberId, viewId, true); vack.setSender(mockMembers[0]); gmsJoinLeave.processMessage(vack); - vack = new ViewAckMessage(gmsJoinLeaveMemberId, gmsJoinLeave.getPreparedView().getViewId(), true); + vack = new ViewAckMessage(gmsJoinLeaveMemberId, viewId, true); vack.setSender(mockMembers[1]); gmsJoinLeave.processMessage(vack); - vack = new ViewAckMessage(gmsJoinLeaveMemberId, gmsJoinLeave.getPreparedView().getViewId(), true); + vack = new ViewAckMessage(gmsJoinLeaveMemberId, viewId, true); vack.setSender(gmsJoinLeaveMemberId); gmsJoinLeave.processMessage(vack);
