removed XXX from resend, centralized message deliver, cleaned up exception handling, added per channel max frame size

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@499121 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 8 deletions

diff --git a/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolSession.java b/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolSession.java
index 01da4ab357..e2b388e174 100644
--- a/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolSession.java
+++ b/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolSession.java
@@ -61,7 +61,6 @@ public class ClusteredProtocolSession extends AMQMinaProtocolSession
     }
 
     public AMQChannel getChannel(int channelId)
-        throws AMQException
     {
         AMQChannel channel = super.getChannel(channelId);
         if (isPeerSession() && channel == null)
@@ -102,21 +101,19 @@ public class ClusteredProtocolSession extends AMQMinaProtocolSession
      */
     private class OneUseChannel extends AMQChannel
     {
-        public OneUseChannel(int channelId, AMQProtocolWriter protocolWriter,
+        public OneUseChannel(int channelId, AMQProtocolSession session,
             AMQMethodListener methodListener)
-            throws AMQException
         {
-            this(channelId, ApplicationRegistry.getInstance(), protocolWriter, methodListener);
+            this(channelId, session, ApplicationRegistry.getInstance(), methodListener);
         }
 
-        public OneUseChannel(int channelId, IApplicationRegistry registry,
-            AMQProtocolWriter protocolWriter, AMQMethodListener methodListener)
-            throws AMQException
+        public OneUseChannel(int channelId, AMQProtocolSession session, IApplicationRegistry registry,
+                             AMQMethodListener methodListener)
         {
             super(channelId,
+                  session,
                   registry.getMessageStore(),
                   registry.getExchangeRegistry(),
-                  protocolWriter,
                   methodListener);
         }