From commits-return-6139-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Tue Jan 30 08:03:39 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id CE79718061A for ; Tue, 30 Jan 2018 08:03:39 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BCFE9160C53; Tue, 30 Jan 2018 07:03:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 102B0160C42 for ; Tue, 30 Jan 2018 08:03:38 +0100 (CET) Received: (qmail 65406 invoked by uid 500); 30 Jan 2018 07:03:38 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 65395 invoked by uid 99); 30 Jan 2018 07:03:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jan 2018 07:03:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E9054E07F0; Tue, 30 Jan 2018 07:03:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: afine@apache.org To: commits@zookeeper.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: zookeeper git commit: ZOOKEEPER-1580: QuorumPeer.setRunning is not used Date: Tue, 30 Jan 2018 07:03:37 +0000 (UTC) Repository: zookeeper Updated Branches: refs/heads/master 78708a858 -> d1b07d588 ZOOKEEPER-1580: QuorumPeer.setRunning is not used - more details in [JIRA:ZOOKEEPER-1580](https://issues.apache.org/jira/browse/ZOOKEEPER-1580) - I forget fetching the upstream codes, make a mistake in the origin [PR-446] (https://github.com/apache/zookeeper/pull/446) which includes some review history,so I close it and open a new one Author: maoling Reviewers: Patrick Hunt , Andor Molnár , Abraham Fine Closes #452 from maoling/ZOOKEEPER-1580 and squashes the following commits: 29a5aba1e [maoling] remove the setter and return back to setting the running field directly 28de1e88f [maoling] ZOOKEEPER-1580:QuorumPeer.setRunning is not used Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/d1b07d58 Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/d1b07d58 Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/d1b07d58 Branch: refs/heads/master Commit: d1b07d588e445085eff4abeb42cf730cc7c57e83 Parents: 78708a8 Author: maoling Authored: Mon Jan 29 23:02:41 2018 -0800 Committer: Abraham Fine Committed: Mon Jan 29 23:02:41 2018 -0800 ---------------------------------------------------------------------- .../main/org/apache/zookeeper/server/quorum/QuorumPeer.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/d1b07d58/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java index 45f32b9..cec1f94 100644 --- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java +++ b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java @@ -479,7 +479,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider currentVote = v; } - volatile boolean running = true; + private volatile boolean running = true; /** * The number of milliseconds of each tick @@ -1750,10 +1750,6 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider public synchronized void initConfigInZKDatabase() { if (zkDb != null) zkDb.initConfigInZKDatabase(getQuorumVerifier()); } - - public void setRunning(boolean running) { - this.running = running; - } public boolean isRunning() { return running;