Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C21A810C8D for ; Mon, 15 Dec 2014 18:35:25 +0000 (UTC) Received: (qmail 58741 invoked by uid 500); 15 Dec 2014 18:35:25 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 58710 invoked by uid 500); 15 Dec 2014 18:35:25 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 58564 invoked by uid 99); 15 Dec 2014 18:35:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Dec 2014 18:35:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 521ECA2BAE1; Mon, 15 Dec 2014 18:35:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Mon, 15 Dec 2014 18:35:25 -0000 Message-Id: <6db732a296c64370923e07e6faca3a92@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] accumulo git commit: ACCUMULO-2981 Replace U+2054 with an 'O' Repository: accumulo Updated Branches: refs/heads/1.6 a971489d4 -> 9558b0d05 refs/heads/master 1e9a42cc6 -> 4cedbeb60 ACCUMULO-2981 Replace U+2054 with an 'O' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9558b0d0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9558b0d0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9558b0d0 Branch: refs/heads/1.6 Commit: 9558b0d050cbaf5dceace02b0301a2f493aa6d39 Parents: a971489 Author: Josh Elser Authored: Mon Dec 15 13:32:18 2014 -0500 Committer: Josh Elser Committed: Mon Dec 15 13:32:18 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/master/Master.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9558b0d0/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 496b6a9..66cbac7 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -188,17 +188,17 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt } static final boolean X = true; - static final boolean ⁔ = false; // use U+2054 because a single underscore is deprecated as an identifier in Java 8. + static final boolean O = false; // @formatter:off static final boolean transitionOK[][] = { // INITIAL HAVE_LOCK SAFE_MODE NORMAL UNLOAD_META UNLOAD_ROOT STOP - /* INITIAL */ {X, X, ⁔, ⁔, ⁔, ⁔, X}, - /* HAVE_LOCK */ {⁔, X, X, X, ⁔, ⁔, X}, - /* SAFE_MODE */ {⁔, ⁔, X, X, X, ⁔, X}, - /* NORMAL */ {⁔, ⁔, X, X, X, ⁔, X}, - /* UNLOAD_METADATA_TABLETS */ {⁔, ⁔, X, X, X, X, X}, - /* UNLOAD_ROOT_TABLET */ {⁔, ⁔, ⁔, X, X, X, X}, - /* STOP */ {⁔, ⁔, ⁔, ⁔, ⁔, X, X}}; + /* INITIAL */ {X, X, O, O, O, O, X}, + /* HAVE_LOCK */ {O, X, X, X, O, O, X}, + /* SAFE_MODE */ {O, O, X, X, X, O, X}, + /* NORMAL */ {O, O, X, X, X, O, X}, + /* UNLOAD_METADATA_TABLETS */ {O, O, X, X, X, X, X}, + /* UNLOAD_ROOT_TABLET */ {O, O, O, X, X, X, X}, + /* STOP */ {O, O, O, O, O, X, X}}; //@formatter:on synchronized void setMasterState(MasterState newState) { if (state.equals(newState))