Deliver async per subscription; not queue

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@661287 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 7 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 64694c2686..847c8b8459 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -59,6 +59,7 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class AMQChannel
 {
@@ -818,7 +819,6 @@ public class AMQChannel
     }
 
 
-
     public void setSuspended(boolean suspended)
     {
 
@@ -828,17 +828,12 @@ public class AMQChannel
         {
             if (wasSuspended)
             {
-                _log.debug("Unsuspending channel " + this);
                 // may need to deliver queued messages
                 for (Subscription s : _tag2SubscriptionMap.values())
                 {
-                    s.getQueue().deliverAsync();
+                    s.getQueue().deliverAsync(s);
                 }
             }
-            else
-            {
-                _log.debug("Suspending channel " + this);
-            }
         }
     }