Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3636 LinkedListImpl leak on mesage consume error

This commit is contained in:
Justin Bertram 2022-01-11 15:17:52 -06:00 committed by clebertsuconic
parent 1c9516db6a
commit 54f4cb560c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
View File

@ -19,7 +19,6 @@ package org.apache.activemq.artemis.core.client.impl;
import java.io.File; import java.io.File;
import java.security.AccessController; import java.security.AccessController;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
import java.util.Iterator;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@ -43,6 +42,7 @@ import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
import org.apache.activemq.artemis.utils.FutureLatch; import org.apache.activemq.artemis.utils.FutureLatch;
import org.apache.activemq.artemis.utils.ReusableLatch; import org.apache.activemq.artemis.utils.ReusableLatch;
import org.apache.activemq.artemis.utils.TokenBucketLimiter; import org.apache.activemq.artemis.utils.TokenBucketLimiter;
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
import org.apache.activemq.artemis.utils.collections.PriorityLinkedList; import org.apache.activemq.artemis.utils.collections.PriorityLinkedList;
import org.apache.activemq.artemis.utils.collections.PriorityLinkedListImpl; import org.apache.activemq.artemis.utils.collections.PriorityLinkedListImpl;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
@ -710,10 +710,8 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
synchronized (this) { synchronized (this) {
// Need to send credits for the messages in the buffer // Need to send credits for the messages in the buffer
Iterator<ClientMessageInternal> iter = buffer.iterator(); try (LinkedListIterator<ClientMessageInternal> iter = buffer.iterator()) {
while (iter.hasNext()) {
while (iter.hasNext()) {
try {
ClientMessageInternal message = iter.next(); ClientMessageInternal message = iter.next();
if (message.isLargeMessage()) { if (message.isLargeMessage()) {
@ -722,9 +720,9 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
} }
flowControlBeforeConsumption(message); flowControlBeforeConsumption(message);
} catch (Exception e) {
ActiveMQClientLogger.LOGGER.errorClearingMessages(e);
} }
} catch (Exception e) {
ActiveMQClientLogger.LOGGER.errorClearingMessages(e);
} }
clearBuffer(); clearBuffer();