[rocketmq] branch develop updated: [ISSUE #2272] Fix spelling mistakes

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new ba5e0e5  [ISSUE #2272] Fix spelling mistakes
ba5e0e5 is described below

commit ba5e0e52b9b3c4735f027a613497ebbadb6145c0
Author: ZingBug <lzh9...@126.com>
AuthorDate: Fri Sep 4 15:39:39 2020 +0800

    [ISSUE #2272] Fix spelling mistakes
---
 .../rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java | 4 ++--
 .../rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java    | 6 ------
 .../java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java | 2 +-
 .../org/apache/rocketmq/client/impl/consumer/PullAPIWrapper.java    | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
index 0929916..a171098 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
@@ -280,7 +280,7 @@ public class ConsumeMessageOrderlyService implements 
ConsumeMessageService {
                 case SUSPEND_CURRENT_QUEUE_A_MOMENT:
                     
this.getConsumerStatsManager().incConsumeFailedTPS(consumerGroup, 
consumeRequest.getMessageQueue().getTopic(), msgs.size());
                     if (checkReconsumeTimes(msgs)) {
-                        
consumeRequest.getProcessQueue().makeMessageToCosumeAgain(msgs);
+                        
consumeRequest.getProcessQueue().makeMessageToConsumeAgain(msgs);
                         this.submitConsumeRequestLater(
                             consumeRequest.getProcessQueue(),
                             consumeRequest.getMessageQueue(),
@@ -312,7 +312,7 @@ public class ConsumeMessageOrderlyService implements 
ConsumeMessageService {
                 case SUSPEND_CURRENT_QUEUE_A_MOMENT:
                     
this.getConsumerStatsManager().incConsumeFailedTPS(consumerGroup, 
consumeRequest.getMessageQueue().getTopic(), msgs.size());
                     if (checkReconsumeTimes(msgs)) {
-                        
consumeRequest.getProcessQueue().makeMessageToCosumeAgain(msgs);
+                        
consumeRequest.getProcessQueue().makeMessageToConsumeAgain(msgs);
                         this.submitConsumeRequestLater(
                             consumeRequest.getProcessQueue(),
                             consumeRequest.getMessageQueue(),
diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
index ab585ea..a9dbc31 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
@@ -348,12 +348,6 @@ public class DefaultMQPushConsumerImpl implements 
MQConsumerInner {
 
                             break;
                         case NO_NEW_MSG:
-                            
pullRequest.setNextOffset(pullResult.getNextBeginOffset());
-
-                            
DefaultMQPushConsumerImpl.this.correctTagsOffset(pullRequest);
-
-                            
DefaultMQPushConsumerImpl.this.executePullRequestImmediately(pullRequest);
-                            break;
                         case NO_MATCHED_MSG:
                             
pullRequest.setNextOffset(pullResult.getNextBeginOffset());
 
diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
index f659bd3..4b9ea62 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
@@ -280,7 +280,7 @@ public class ProcessQueue {
         return -1;
     }
 
-    public void makeMessageToCosumeAgain(List<MessageExt> msgs) {
+    public void makeMessageToConsumeAgain(List<MessageExt> msgs) {
         try {
             this.lockTreeMap.writeLock().lockInterruptibly();
             try {
diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullAPIWrapper.java
 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullAPIWrapper.java
index 231ac0c..cc42a9e 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullAPIWrapper.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullAPIWrapper.java
@@ -194,7 +194,7 @@ public class PullAPIWrapper {
 
             String brokerAddr = findBrokerResult.getBrokerAddr();
             if (PullSysFlag.hasClassFilterFlag(sysFlagInner)) {
-                brokerAddr = computPullFromWhichFilterServer(mq.getTopic(), 
brokerAddr);
+                brokerAddr = computePullFromWhichFilterServer(mq.getTopic(), 
brokerAddr);
             }
 
             PullResult pullResult = 
this.mQClientFactory.getMQClientAPIImpl().pullMessage(
@@ -223,7 +223,7 @@ public class PullAPIWrapper {
         return MixAll.MASTER_ID;
     }
 
-    private String computPullFromWhichFilterServer(final String topic, final 
String brokerAddr)
+    private String computePullFromWhichFilterServer(final String topic, final 
String brokerAddr)
         throws MQClientException {
         ConcurrentMap<String, TopicRouteData> topicRouteTable = 
this.mQClientFactory.getTopicRouteTable();
         if (topicRouteTable != null) {