ARTEMIS-4135 mitigate NPE when browsing

2023-01-17 10:08:00 -06:00 · 2023-01-17 10:08:00 -06:00 · bd99a11780
parent 8a974fe89c
commit bd99a11780
1 changed files with 1 additions and 1 deletions
--- 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
@ -4382,7 +4382,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
      LinkedListIterator<MessageReference> messagesIterator = null;

      private LinkedListIterator<PagedReference> getPagingIterator() {
-         if (pagingIterator == null) {
+         if (pagingIterator == null && pageSubscription != null) {
            pagingIterator = pageSubscription.iterator(true);
         }
         return pagingIterator;