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

ARTEMIS-4233 Avoiding holder.iter=null with a compile time validation

This commit is contained in:
Clebert Suconic 2023-04-03 09:55:48 -04:00 committed by clebertsuconic
parent d9d727b9c2
commit 23bbf76bdf
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View File

@ -3093,9 +3093,21 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
break;
}
ConsumerHolder<? extends Consumer> holder;
final ConsumerHolder<? extends Consumer> holder;
final LinkedListIterator<MessageReference> holderIterator;
if (consumers.hasNext()) {
holder = consumers.next();
if (holder == null) {
// this shouldn't happen, however I'm adding this check just in case
logger.debug("consumers.next() returned null.");
consumers.remove();
deliverAsync(true);
return false;
}
if (holder.iter == null) {
holder.iter = messageReferences.iterator();
}
holderIterator = holder.iter;
} else {
pruneLastValues();
break;
@ -3112,12 +3124,8 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
return false;
}
if (holder.iter == null) {
holder.iter = messageReferences.iterator();
}
if (holder.iter.hasNext()) {
ref = holder.iter.next();
if (holderIterator.hasNext()) {
ref = holderIterator.next();
} else {
ref = null;
}
@ -3167,7 +3175,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
consumers.reset();
} else if (status == HandleStatus.BUSY) {
try {
holder.iter.repeat();
holderIterator.repeat();
} catch (NoSuchElementException e) {
// this could happen if there was an exception on the queue handling
// and it returned BUSY because of that exception