Merge pull request #1106 from pzygielo/useless-b

eclipse-ee4j · Aug 6, 2021 · e598239 · e598239
2 parents f07bec7 + f941958
commit e598239
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...in/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java b/...in/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java
@@ -703,7 +703,7 @@ public void setParentList(PartitionedStore pstore, SubSet set) {
     }
 
     protected void getMoreMessages(int num) {
-        Map<PartitionedStore, SubSet> ss = new LinkedHashMap<>();
+        final Map<PartitionedStore, SubSet> ss = new LinkedHashMap<>();
         synchronized (parentListMap) {
             ss.putAll(parentListMap);
         }
@@ -717,7 +717,8 @@ protected void getMoreMessages(int num) {
                 return;
             }
             SubSet pl = null;
-            while (!isFailover && isActive() && !isPaused() && isValid() && ss != null && (pl = getNonEmptyParentList(ss, pl)) != null && count < num
+            assert ss != null;
+            while (!isFailover && isActive() && !isPaused() && isValid() && (pl = getNonEmptyParentList(ss, pl)) != null && count < num
                     && (parent == null || !parent.isPaused())) {
 
                 PacketReference mm = (PacketReference) pl.removeNext();