提交 a79c66ae 编写于 作者: Y yukon

Merge branch 'master' into develop

# This is a combination of 3 commits.
# The first commit's message is:
remove spaces before and after the properties
# This is the 2nd commit message:
remove spaces before and after the properties
remove spaces before and after the properties
remove spaces before and after the properties
remove spaces before and after the properties
Remove spaces before and after the properties
Remove spaces before and after the properties
Remove spaces before and after the properties
Remove spaces before and after the properties
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove spaces before and after the properties
Remove spaces before and after the properties
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
remove spaces before and after the properties
remove spaces before and after the properties
Remove spaces before and after the properties
Remove spaces before and after the properties
Remove spaces before and after the properties
Remove spaces before and after the properties
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove spaces before and after the properties
Remove spaces before and after the properties
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
Remove the code that is not useful in the loop
# This is the 3rd commit message:
remove spaces before and after the properties
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Wed May 17 16:11:07 2017 +0800
#
# interactive rebase in progress; onto a2894b6
# Last commands done (3 commands done):
# squash 76b35ab remove spaces before and after the properties
# squash 92f83bc remove spaces before and after the properties
# Next commands to do (12 remaining commands):
# squash d142037 remove spaces before and after the properties
# squash 9df0fcb remove spaces before and after the properties
# You are currently rebasing branch 'Branch_0616' on 'a2894b6'.
#
# Changes to be committed:
# modified: client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
# modified: common/src/main/java/org/apache/rocketmq/common/MixAll.java
# new file: "\357\200\272"
#
...@@ -975,7 +975,6 @@ public class MQClientInstance { ...@@ -975,7 +975,6 @@ public class MQClientInstance {
HashMap<Long/* brokerId */, String/* address */> map = this.brokerAddrTable.get(brokerName); HashMap<Long/* brokerId */, String/* address */> map = this.brokerAddrTable.get(brokerName);
if (map != null && !map.isEmpty()) { if (map != null && !map.isEmpty()) {
FOR_SEG:
for (Map.Entry<Long, String> entry : map.entrySet()) { for (Map.Entry<Long, String> entry : map.entrySet()) {
Long id = entry.getKey(); Long id = entry.getKey();
brokerAddr = entry.getValue(); brokerAddr = entry.getValue();
...@@ -983,7 +982,6 @@ public class MQClientInstance { ...@@ -983,7 +982,6 @@ public class MQClientInstance {
found = true; found = true;
if (MixAll.MASTER_ID == id) { if (MixAll.MASTER_ID == id) {
slave = false; slave = false;
break FOR_SEG;
} else { } else {
slave = true; slave = true;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册