diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java b/src/java/main/org/apache/zookeeper/server/quorum/Leader.java index 0ef5e2c6b0d..5cd836fc28d 100644 --- a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java +++ b/src/java/main/org/apache/zookeeper/server/quorum/Leader.java @@ -724,7 +724,9 @@ synchronized public boolean tryToCommit(Proposal p, long zxid, SocketAddress fol // concurrent reconfigs are allowed, this can happen. if (outstandingProposals.containsKey(zxid - 1)) return false; - // getting a quorum from all necessary configurations + // in order to be committed, a proposal must be accepted by a quorum. + // + // getting a quorum from all necessary configurations. if (!p.hasAllQuorums()) { return false; } @@ -737,8 +739,6 @@ synchronized public boolean tryToCommit(Proposal p, long zxid, SocketAddress fol + (lastCommitted+1)); } - // in order to be committed, a proposal must be accepted by a quorum - outstandingProposals.remove(zxid); if (p.request != null) {