diff --git a/1 b/1 new file mode 100644 index 0000000000000000000000000000000000000000..5f9f277ed4b431d0f1ab9322fb6387a942be36c3 --- /dev/null +++ b/1 @@ -0,0 +1,105 @@ +# 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" +# diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java b/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java index 365fca9fa1065c2fe3641bd891dd3b6869c09040..83b9ee7671cf591190a5ec41fd4f6b003754c2b1 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java @@ -975,7 +975,6 @@ public class MQClientInstance { HashMap map = this.brokerAddrTable.get(brokerName); if (map != null && !map.isEmpty()) { - FOR_SEG: for (Map.Entry entry : map.entrySet()) { Long id = entry.getKey(); brokerAddr = entry.getValue(); @@ -983,7 +982,6 @@ public class MQClientInstance { found = true; if (MixAll.MASTER_ID == id) { slave = false; - break FOR_SEG; } else { slave = true; }