ARTEMIS-4581 fix NPE crash in PostOfficeImpl

apache · Jan 22, 2024 · fbfe81e · fbfe81e
1 parent 6f6c572
commit fbfe81e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/...server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -1969,7 +1969,9 @@ void reapAddresses(boolean initialCheck) {
          AddressSettings settings = addressSettingsRepository.getMatch(queue.getAddress().toString());
          if (!queue.isInternalQueue() && queue.isAutoDelete() && QueueManagerImpl.consumerCountCheck(queue) && (initialCheck || QueueManagerImpl.delayCheck(queue, settings)) && QueueManagerImpl.messageCountCheck(queue) && (initialCheck || queueWasUsed(queue, settings))) {
             // we only reap queues on the initialCheck if they are actually empty
-            boolean validInitialCheck = initialCheck && queue.getMessageCount() == 0 && !queue.getPagingStore().isPaging();
+            PagingStore queuePagingStore = queue.getPagingStore();
+            boolean isPaging = queuePagingStore != null && queuePagingStore.isPaging();
+            boolean validInitialCheck = initialCheck && queue.getMessageCount() == 0 && !isPaging;
             if (validInitialCheck || queue.isSwept()) {
                if (logger.isDebugEnabled()) {
                   if (initialCheck) {