提交 cc3f9f3b 编写于 作者: D dongeforever

Fix check style

上级 29fb3339
...@@ -10,4 +10,5 @@ devenv ...@@ -10,4 +10,5 @@ devenv
*.versionsBackup *.versionsBackup
!NOTICE-BIN !NOTICE-BIN
!LICENSE-BIN !LICENSE-BIN
.DS_Store .DS_Store
\ No newline at end of file localbin/
...@@ -1029,7 +1029,7 @@ public class BrokerController { ...@@ -1029,7 +1029,7 @@ public class BrokerController {
private void handleSlaveSynchronize(BrokerRole role) { private void handleSlaveSynchronize(BrokerRole role) {
if (role == BrokerRole.SLAVE) { if (role == BrokerRole.SLAVE) {
if (null != slaveSyncFuture){ if (null != slaveSyncFuture) {
slaveSyncFuture.cancel(false); slaveSyncFuture.cancel(false);
} }
this.slaveSynchronize.setMasterAddr(null); this.slaveSynchronize.setMasterAddr(null);
...@@ -1046,7 +1046,7 @@ public class BrokerController { ...@@ -1046,7 +1046,7 @@ public class BrokerController {
}, 1000 * 10, 1000 * 60, TimeUnit.MILLISECONDS); }, 1000 * 10, 1000 * 60, TimeUnit.MILLISECONDS);
} else { } else {
//handle the slave synchronise //handle the slave synchronise
if (null != slaveSyncFuture){ if (null != slaveSyncFuture) {
slaveSyncFuture.cancel(false); slaveSyncFuture.cancel(false);
} }
this.slaveSynchronize.setMasterAddr(null); this.slaveSynchronize.setMasterAddr(null);
......
/*
* 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; package org.apache.rocketmq.broker.dleger;
import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.broker.BrokerController;
......
...@@ -366,7 +366,7 @@ public class DLegerCommitLog extends CommitLog { ...@@ -366,7 +366,7 @@ public class DLegerCommitLog extends CommitLog {
break; break;
case INCONSISTENT_LEADER: case INCONSISTENT_LEADER:
case NOT_LEADER: case NOT_LEADER:
case NOT_READY: case LEADER_NOT_READY:
case DISK_FULL: case DISK_FULL:
putMessageStatus = PutMessageStatus.SERVICE_NOT_AVAILABLE; putMessageStatus = PutMessageStatus.SERVICE_NOT_AVAILABLE;
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册