[pulsar] branch branch-2.7 updated: always remove message data size (#8566)

[yong]

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

yong pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new fbd6229  always remove message data size (#8566)
fbd6229 is described below

commit fbd62294b5d319ba25531740a6873fcc43e1aa9e
Author: Mak <33799668+maic...@users.noreply.github.com>
AuthorDate: Sun Feb 28 10:07:16 2021 +0800

    always remove message data size (#8566)
    
    * always remove message data size
    
    Signed-off-by: mak <610546...@qq.com>
    
    * Fix the CI issue
    
    * Fix the CI
    
    Co-authored-by: Yong Zhang <zhangyong1025...@gmail.com>
    (cherry picked from commit a8b921cf15c0a0f652f1d9f62a6481efea243881)
---
 .../main/java/org/apache/pulsar/client/impl/ConsumerImpl.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
index 2b63673..a2b427d 100644
--- 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
+++ 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
@@ -1510,13 +1510,12 @@ public class ConsumerImpl<T> extends ConsumerBase<T> 
implements ConnectionHandle
 
         if (msgCnx != currentCnx) {
             // The processed message did belong to the old queue that was 
cleared after reconnection.
-            return;
-        }
-
-        increaseAvailablePermits(currentCnx);
-        stats.updateNumMsgsReceived(msg);
+        } else {
+            increaseAvailablePermits(currentCnx);
+            stats.updateNumMsgsReceived(msg);
 
-        trackMessage(msg);
+            trackMessage(msg);
+        }
         decreaseIncomingMessageSize(msg);
     }