[activemq] branch activemq-5.15.x updated: AMQ-7129 - code cleanup

[cshannon]

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

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


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
     new 5acd930  AMQ-7129 - code cleanup
5acd930 is described below

commit 5acd9303a53cd11f5109bfa96591d8d6dbf853bc
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
AuthorDate: Fri Jan 11 10:31:44 2019 -0500

    AMQ-7129 - code cleanup
    
    (cherry picked from commit a16b227808bec2977f1d3323bf29257b3c8ca9f6)
---
 .../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 8030bc4..83650e8 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
@@ -3010,24 +3010,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();
                     }
                 }
             }