From 5c49dcf7a19aa278325a09daa053d6de00da3355 Mon Sep 17 00:00:00 2001 From: Piotrek Zygielo Date: Fri, 6 Aug 2021 19:13:46 +0200 Subject: [PATCH 1/2] Make local variable final Show/check it is not re-assigned. --- .../java/com/sun/messaging/jmq/jmsserver/core/Consumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java b/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java index 84aeac38b..4b0fe0ec2 100644 --- a/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java +++ b/mq/main/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 ss = new LinkedHashMap<>(); + final Map ss = new LinkedHashMap<>(); synchronized (parentListMap) { ss.putAll(parentListMap); } From f9419586841a5da394dc213c09479b1e7953c896 Mon Sep 17 00:00:00 2001 From: Piotrek Zygielo Date: Fri, 6 Aug 2021 19:16:18 +0200 Subject: [PATCH 2/2] Remove useless check --- .../java/com/sun/messaging/jmq/jmsserver/core/Consumer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java b/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java index 4b0fe0ec2..9a691ec07 100644 --- a/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java +++ b/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Consumer.java @@ -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();