[activemq] branch master updated: AMQ-7129 - code cleanup

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[activemq] branch master updated: AMQ-7129 - code cleanup

cshannon
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new a16b227  AMQ-7129 - code cleanup
a16b227 is described below

commit a16b227808bec2977f1d3323bf29257b3c8ca9f6
Author: Christopher L. Shannon (cshannon) <[hidden email]>
AuthorDate: Fri Jan 11 10:31:44 2019 -0500

    AMQ-7129 - code cleanup
---
 .../activemq/store/kahadb/MessageDatabase.java     | 34 ++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 0bc6e81..89f694b 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -3029,24 +3029,22 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
             //grab the messages attached to this subscription
             SequenceSet messageSequences = sd.ackPositions.get(tx, subscriptionKey);
 
-            if (messageSequences != null) {
-                if (!messageSequences.isEmpty()) {
-                    final Sequence head = messageSequences.getHead();
-
-                    //get an iterator over the order index starting at the first unacked message
-                    //and go over each message to add up the size
-                    Iterator<Entry<Long, MessageKeys>> iterator = sd.orderIndex.iterator(tx,
-                            new MessageOrderCursor(head.getFirst()));
-
-                    final boolean contiguousRange = messageSequences.size() == 1;
-                    while (iterator.hasNext()) {
-                        Entry<Long, MessageKeys> entry = iterator.next();
-                        //Verify sequence contains the key
-                        //if contiguous we just add all starting with the first but if not
-                        //we need to check if the id is part of the range - could happen if individual ack mode was used
-                        if (contiguousRange || messageSequences.contains(entry.getKey())) {
-                            locationSize += entry.getValue().location.getSize();
-                        }
+            if (messageSequences != null && !messageSequences.isEmpty()) {
+                final Sequence head = messageSequences.getHead();
+
+                //get an iterator over the order index starting at the first unacked message
+                //and go over each message to add up the size
+                Iterator<Entry<Long, MessageKeys>> iterator = sd.orderIndex.iterator(tx,
+                        new MessageOrderCursor(head.getFirst()));
+
+                final boolean contiguousRange = messageSequences.size() == 1;
+                while (iterator.hasNext()) {
+                    Entry<Long, MessageKeys> entry = iterator.next();
+                    //Verify sequence contains the key
+                    //if contiguous we just add all starting with the first but if not
+                    //we need to check if the id is part of the range - could happen if individual ack mode was used
+                    if (contiguousRange || messageSequences.contains(entry.getKey())) {
+                        locationSize += entry.getValue().location.getSize();
                     }
                 }
             }