1 files changed, 8 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
index 4cc7e6fce2..5b3f5250c5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
@@ -101,6 +101,7 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
     private String _traceExclude;
     private String _trace;
     private long _createTime = System.currentTimeMillis();
+    private final AtomicLong _deliveredCount = new AtomicLong(0);
 
 
     public Subscription_0_10(ServerSession session, String destination, MessageAcceptMode acceptMode,
@@ -257,6 +258,11 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
     {
         return getQueue().getConfigStore();
     }
+    
+    public Long getDelivered()
+    {
+        return _deliveredCount.get();
+    }
 
     public void creditStateChanged(boolean hasCredit)
     {
@@ -531,7 +537,7 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
 
         if(!excludeDueToFederation)
         {
-            if(_acceptMode == MessageAcceptMode.NONE)
+            if(_acceptMode == MessageAcceptMode.NONE && _acquireMode != MessageAcquireMode.PRE_ACQUIRED)
             {
                 xfr.setCompletionListener(new MessageAcceptCompletionListener(this, _session, entry, _flowMode == MessageFlowMode.WINDOW));
             }
@@ -558,7 +564,7 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
             }
 
             _session.sendMessage(xfr, _postIdSettingAction);
-
+            _deliveredCount.incrementAndGet();
             if(_acceptMode == MessageAcceptMode.NONE && _acquireMode == MessageAcquireMode.PRE_ACQUIRED)
             {
                 forceDequeue(entry, false);