This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 1ba0b65bab ARTEMIS-5094 potential null dereference in QueueImpl
1ba0b65bab is described below
commit 1ba0b65babf298e4dc47951aa6998b2d0ac02be6
Author: Justin Bertram <[email protected]>
AuthorDate: Wed Jan 15 10:48:05 2025 -0600
ARTEMIS-5094 potential null dereference in QueueImpl
The `server` variable is used liberally through this `Queue`
implementation. It makes sense to assume it is non-null. If it is `null`
then a `NullPointerException` will be thrown immediately just as if we
used `Objects.requireNonNull(server)`.
---
.../apache/activemq/artemis/core/server/impl/QueueImpl.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index b3a57d1af8..f518b9d0d6 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.core.server.impl;
import javax.security.auth.Subject;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.util.HashMap;
@@ -119,11 +120,9 @@ import
org.apache.activemq.artemis.utils.collections.PriorityLinkedList;
import org.apache.activemq.artemis.utils.collections.PriorityLinkedListImpl;
import org.apache.activemq.artemis.utils.collections.TypedProperties;
import org.apache.activemq.artemis.utils.critical.CriticalComponentImpl;
-import org.apache.activemq.artemis.utils.critical.EmptyCriticalAnalyzer;
+import org.jctools.queues.MpscUnboundedArrayQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.lang.invoke.MethodHandles;
-import org.jctools.queues.MpscUnboundedArrayQueue;
import static
org.apache.activemq.artemis.utils.collections.IterableStream.iterableOf;
@@ -656,7 +655,7 @@ public class QueueImpl extends CriticalComponentImpl
implements Queue {
final ArtemisExecutor executor,
final ActiveMQServer server,
final QueueFactory factory) {
- super(server == null ? EmptyCriticalAnalyzer.getInstance() :
server.getCriticalAnalyzer(), CRITICAL_PATHS);
+ super(server.getCriticalAnalyzer(), CRITICAL_PATHS);
this.createdTimestamp = System.currentTimeMillis();
@@ -2044,7 +2043,7 @@ public class QueueImpl extends CriticalComponentImpl
implements Queue {
auditLogAck(subject, remoteAddress, ref, tx);
}
}
- if (server != null && server.hasBrokerMessagePlugins()) {
+ if (server.hasBrokerMessagePlugins()) {
server.callBrokerMessagePlugins(plugin ->
plugin.messageAcknowledged(tx, ref, reason, consumer));
}
}
@@ -2176,7 +2175,7 @@ public class QueueImpl extends CriticalComponentImpl
implements Queue {
// potentially auto-delete this queue if this expired the last message
refCountForConsumers.check();
- if (server != null && server.hasBrokerMessagePlugins()) {
+ if (server.hasBrokerMessagePlugins()) {
if (tx == null) {
server.callBrokerMessagePlugins(plugin ->
plugin.messageExpired(ref, settingsToUse.getExpiryAddress(), consumer));
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
