[GitHub] vongosling closed pull request #121: [ROCKETMQ-226]Remove the code that is not useful in the loop

[GitBox <gi...@apache.org>]

vongosling closed pull request #121: [ROCKETMQ-226]Remove the code that is not useful in the loop
URL: https://github.com/apache/rocketmq/pull/121
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/1 b/1
new file mode 100644
index 00000000..5f9f277e
--- /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 b0c3b049..6d9005f2 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
@@ -920,7 +920,6 @@ public FindBrokerResult findBrokerAddressInAdmin(final String brokerName) {
 
         HashMap<Long/* brokerId */, String/* address */> map = this.brokerAddrTable.get(brokerName);
         if (map != null && !map.isEmpty()) {
-            FOR_SEG:
             for (Map.Entry<Long, String> entry : map.entrySet()) {
                 Long id = entry.getKey();
                 brokerAddr = entry.getValue();
@@ -928,7 +927,6 @@ public FindBrokerResult findBrokerAddressInAdmin(final String brokerName) {
                     found = true;
                     if (MixAll.MASTER_ID == id) {
                         slave = false;
-                        break FOR_SEG;
                     } else {
                         slave = true;
                     }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services