1 files changed, 11 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
index 05121ff1ab..1f4333549a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
@@ -98,6 +98,7 @@ public class UnacknowledgedMessageMapImpl implements UnacknowledgedMessageMap
             {
                 visitor.callback(msg);
             }
+            visitor.visitComplete();
         }
     }
 
@@ -186,7 +187,8 @@ public class UnacknowledgedMessageMapImpl implements UnacknowledgedMessageMap
             }
         }
     }
-    private UnacknowledgedMessage get(long key)
+
+    public UnacknowledgedMessage get(long key)
     {
         synchronized (_lock)
         {
@@ -194,6 +196,14 @@ public class UnacknowledgedMessageMapImpl implements UnacknowledgedMessageMap
         }
     }
 
+    public Set<Long> getDeliveryTags()
+    {
+        synchronized (_lock)
+        {
+            return _map.keySet();
+        }
+    }
+
     private void collect(long key, List<UnacknowledgedMessage> msgs)
     {
         synchronized (_lock)