[AMQ-8395] Avoid possible NPE when sending advisory message

(cherry picked from commit f74992c105)
2021-10-04 10:14:32 +02:00 · 2021-10-04 10:14:32 +02:00 · 57b1316d21
parent 0476091fee
commit 57b1316d21
1 changed files with 1 additions and 1 deletions
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
@ -540,7 +540,7 @@ public class Topic extends BaseDestination implements Task {

        message.incrementReferenceCount();

-        if (context.isInTransaction()) {
+        if (context.isInTransaction() && (context.getTransaction() != null)) {
            context.getTransaction().addSynchronization(new Synchronization() {
                @Override
                public void afterCommit() throws Exception {