zhouxinyu closed pull request #196: [ROCKETMQ-314] msg send back must sync
change process queue msg size
URL: https://github.com/apache/rocketmq/pull/196
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/impl/consumer/ProcessQueue.java
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
index e21dbc8f..4176520a 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
@@ -17,6 +17,7 @@
package org.apache.rocketmq.client.impl.consumer;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -102,7 +103,7 @@ public void cleanExpiredMsg(DefaultMQPushConsumer
pushConsumer) {
try {
if (!msgTreeMap.isEmpty() && msg.getQueueOffset() ==
msgTreeMap.firstKey()) {
try {
- msgTreeMap.remove(msgTreeMap.firstKey());
+ removeMessage(Collections.singletonList(msg));
} catch (Exception e) {
log.error("send expired msg exception", e);
}
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
