From cc3f9f3b3a47182ebb5b764d64532e01e0a33512 Mon Sep 17 00:00:00 2001
From: dongeforever <dongeforever@apache.org>
Date: Tue, 13 Nov 2018 14:35:16 +0800
Subject: [PATCH] Fix check style

---
 .gitignore                                       |  3 ++-
 .../apache/rocketmq/broker/BrokerController.java |  4 ++--
 .../broker/dleger/DLegerRoleChangeHandler.java   | 16 ++++++++++++++++
 .../rocketmq/store/dleger/DLegerCommitLog.java   |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 80c6f569..c4e43cd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ devenv
 *.versionsBackup
 !NOTICE-BIN
 !LICENSE-BIN
-.DS_Store
\ No newline at end of file
+.DS_Store
+localbin/
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index d5d6a53a..a6aecf80 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -1029,7 +1029,7 @@ public class BrokerController {
 
     private void handleSlaveSynchronize(BrokerRole role) {
         if (role == BrokerRole.SLAVE) {
-            if (null != slaveSyncFuture){
+            if (null != slaveSyncFuture) {
                 slaveSyncFuture.cancel(false);
             }
             this.slaveSynchronize.setMasterAddr(null);
@@ -1046,7 +1046,7 @@ public class BrokerController {
             }, 1000 * 10, 1000 * 60, TimeUnit.MILLISECONDS);
         } else {
             //handle the slave synchronise
-            if (null != slaveSyncFuture){
+            if (null != slaveSyncFuture) {
                 slaveSyncFuture.cancel(false);
             }
             this.slaveSynchronize.setMasterAddr(null);
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java b/broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java
index 267f7372..9503fc8e 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.rocketmq.broker.dleger;
 
 import org.apache.rocketmq.broker.BrokerController;
diff --git a/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java b/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java
index 3b0ee87a..dd84d316 100644
--- a/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java
@@ -366,7 +366,7 @@ public class DLegerCommitLog extends CommitLog {
                         break;
                     case INCONSISTENT_LEADER:
                     case NOT_LEADER:
-                    case NOT_READY:
+                    case LEADER_NOT_READY:
                     case DISK_FULL:
                         putMessageStatus = PutMessageStatus.SERVICE_NOT_AVAILABLE;
                         break;
-- 
GitLab