Skip to content

Commit e598239

Browse files
committed
Merge pull request #1106 from pzygielo/useless-b
2 parents f07bec7 + f941958 commit e598239

File tree

1 file changed

+3
-2
lines changed
  • mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core

1 file changed

+3
-2
lines changed

mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ public void setParentList(PartitionedStore pstore, SubSet set) {
703703
}
704704

705705
protected void getMoreMessages(int num) {
706-
Map<PartitionedStore, SubSet> ss = new LinkedHashMap<>();
706+
final Map<PartitionedStore, SubSet> ss = new LinkedHashMap<>();
707707
synchronized (parentListMap) {
708708
ss.putAll(parentListMap);
709709
}
@@ -717,7 +717,8 @@ protected void getMoreMessages(int num) {
717717
return;
718718
}
719719
SubSet pl = null;
720-
while (!isFailover && isActive() && !isPaused() && isValid() && ss != null && (pl = getNonEmptyParentList(ss, pl)) != null && count < num
720+
assert ss != null;
721+
while (!isFailover && isActive() && !isPaused() && isValid() && (pl = getNonEmptyParentList(ss, pl)) != null && count < num
721722
&& (parent == null || !parent.isPaused())) {
722723

723724
PacketReference mm = (PacketReference) pl.removeNext();

0 commit comments

Comments
 (0)