[GitHub] zhouxinyu closed pull request #173: bugfix SelectMessageQueueByRandom.java

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

zhouxinyu closed pull request #173: bugfix SelectMessageQueueByRandom.java
URL: https://github.com/apache/rocketmq/pull/173
 
 
   

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/client/src/main/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByRandoom.java b/client/src/main/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByRandom.java
similarity index 85%
rename from client/src/main/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByRandoom.java
rename to client/src/main/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByRandom.java
index 4e9a92d2..070fcc3e 100644
--- a/client/src/main/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByRandoom.java
+++ b/client/src/main/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByRandom.java
@@ -22,17 +22,12 @@
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
 
-public class SelectMessageQueueByRandoom implements MessageQueueSelector {
+public class SelectMessageQueueByRandom implements MessageQueueSelector {
     private Random random = new Random(System.currentTimeMillis());
 
     @Override
     public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) {
-        int value = random.nextInt();
-        if (value < 0) {
-            value = Math.abs(value);
-        }
-
-        value = value % mqs.size();
+        int value = random.nextInt(mqs.size());
         return mqs.get(value);
     }
 }
diff --git a/dev/merge_rocketmq_pr.py b/dev/merge_rocketmq_pr.py
index 3a2388bf..afc597a6 100644
--- a/dev/merge_rocketmq_pr.py
+++ b/dev/merge_rocketmq_pr.py
@@ -146,8 +146,10 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
 
     merge_message_flags = []
 
-    title = raw_input("Modify commit log [%s]: " % title)
-    merge_message_flags += ["-m", title]
+    modified_title = raw_input("Modify commit log [%s]: " % title)
+    if modified_title == "":
+        modified_title = title
+    merge_message_flags += ["-m", modified_title]
 
     authors = "\n".join(["Author: %s" % a for a in distinct_authors])
 


 

----------------------------------------------------------------
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