Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChainedClusterMethodHandler.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChainedClusterMethodHandler.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChainedClusterMethodHandler.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChainedClusterMethodHandler.java Fri Jan 19 14:19:51 2007 @@ -54,19 +54,19 @@ } } - protected final void peer(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + protected final void peer(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { for(ClusterMethodHandler<A> handler : _handlers) { - handler.peer(stateMgr, queues, exchanges, session, evt); + handler.peer(session, evt); } } - protected final void client(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + protected final void client(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { for(ClusterMethodHandler<A> handler : _handlers) { - handler.client(stateMgr, queues, exchanges, session, evt); + handler.client(session, evt); } } }
Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChannelQueueManager.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChannelQueueManager.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChannelQueueManager.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChannelQueueManager.java Fri Jan 19 14:19:51 2007 @@ -83,22 +83,22 @@ private class QueueDeclareHandler extends ClusterMethodHandler<QueueDeclareBody> { - protected void peer(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<QueueDeclareBody> evt) throws AMQException + protected void peer(AMQProtocolSession session, AMQMethodEvent<QueueDeclareBody> evt) throws AMQException { } - protected void client(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<QueueDeclareBody> evt) throws AMQException + protected void client(AMQProtocolSession session, AMQMethodEvent<QueueDeclareBody> evt) throws AMQException { set(evt.getChannelId(), evt.getMethod().queue); } } private class QueueBindHandler extends ClusterMethodHandler<QueueBindBody> { - protected void peer(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<QueueBindBody> evt) throws AMQException + protected void peer(AMQProtocolSession session, AMQMethodEvent<QueueBindBody> evt) throws AMQException { } - protected void client(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<QueueBindBody> evt) throws AMQException + protected void client(AMQProtocolSession session, AMQMethodEvent<QueueBindBody> evt) throws AMQException { if(evt.getMethod().queue == null) { @@ -108,11 +108,11 @@ } private class QueueDeleteHandler extends ClusterMethodHandler<QueueDeleteBody> { - protected void peer(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<QueueDeleteBody> evt) throws AMQException + protected void peer(AMQProtocolSession session, AMQMethodEvent<QueueDeleteBody> evt) throws AMQException { } - protected void client(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<QueueDeleteBody> evt) throws AMQException + protected void client(AMQProtocolSession session, AMQMethodEvent<QueueDeleteBody> evt) throws AMQException { if(evt.getMethod().queue == null) { @@ -123,11 +123,11 @@ private class MessageConsumeHandler extends ClusterMethodHandler<MessageConsumeBody> { - protected void peer(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<MessageConsumeBody> evt) throws AMQException + protected void peer(AMQProtocolSession session, AMQMethodEvent<MessageConsumeBody> evt) throws AMQException { } - protected void client(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<MessageConsumeBody> evt) throws AMQException + protected void client(AMQProtocolSession session, AMQMethodEvent<MessageConsumeBody> evt) throws AMQException { if(evt.getMethod().queue == null) { Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandler.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandler.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandler.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandler.java Fri Jan 19 14:19:51 2007 @@ -32,18 +32,18 @@ public abstract class ClusterMethodHandler<A extends AMQMethodBody> implements StateAwareMethodListener<A> { - public final void methodReceived(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + public final void methodReceived(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { if (ClusteredProtocolSession.isPeerSession(session)) { - peer(stateMgr, queues, exchanges, session, evt); + peer(session, evt); } else { - client(stateMgr, queues, exchanges, session, evt); + client(session, evt); } } - protected abstract void peer(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException; - protected abstract void client(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException; + protected abstract void peer(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException; + protected abstract void client(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException; } Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandlerFactory.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandlerFactory.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandlerFactory.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandlerFactory.java Fri Jan 19 14:19:51 2007 @@ -162,8 +162,7 @@ private class SynchHandler implements StateAwareMethodListener<ClusterSynchBody> { - public void methodReceived(AMQStateManager stateManager, QueueRegistry queueRegistry, - ExchangeRegistry exchangeRegistry, AMQProtocolSession session, + public void methodReceived(AMQProtocolSession session, AMQMethodEvent<ClusterSynchBody> evt) throws AMQException { _groupMgr.handleSynch(ClusteredProtocolSession.getSessionPeer(session)); @@ -172,8 +171,7 @@ private class JoinHandler implements StateAwareMethodListener<ClusterJoinBody> { - public void methodReceived(AMQStateManager stateManager, QueueRegistry queueRegistry, - ExchangeRegistry exchangeRegistry, AMQProtocolSession session, + public void methodReceived(AMQProtocolSession session, AMQMethodEvent<ClusterJoinBody> evt) throws AMQException { _groupMgr.handleJoin(new SimpleMemberHandle(evt.getMethod().broker)); @@ -182,8 +180,7 @@ private class LeaveHandler implements StateAwareMethodListener<ClusterLeaveBody> { - public void methodReceived(AMQStateManager stateManager, QueueRegistry queueRegistry, - ExchangeRegistry exchangeRegistry, AMQProtocolSession protocolSession, + public void methodReceived(AMQProtocolSession protocolSession, AMQMethodEvent<ClusterLeaveBody> evt) throws AMQException { _groupMgr.handleLeave(new SimpleMemberHandle(evt.getMethod().broker)); @@ -192,8 +189,7 @@ private class SuspectHandler implements StateAwareMethodListener<ClusterSuspectBody> { - public void methodReceived(AMQStateManager stateManager, QueueRegistry queueRegistry, - ExchangeRegistry exchangeRegistry, AMQProtocolSession protocolSession, + public void methodReceived(AMQProtocolSession protocolSession, AMQMethodEvent<ClusterSuspectBody> evt) throws AMQException { _groupMgr.handleSuspect(new SimpleMemberHandle(evt.getMethod().broker)); @@ -202,8 +198,7 @@ private class MembershipHandler implements StateAwareMethodListener<ClusterMembershipBody> { - public void methodReceived(AMQStateManager stateManager, QueueRegistry queueRegistry, - ExchangeRegistry exchangeRegistry, AMQProtocolSession session, + public void methodReceived(AMQProtocolSession session, AMQMethodEvent<ClusterMembershipBody> evt) throws AMQException { ClusterMembershipBody body = evt.getMethod(); @@ -213,8 +208,7 @@ private class PingHandler implements StateAwareMethodListener<ClusterPingBody> { - public void methodReceived(AMQStateManager stateManager, QueueRegistry queueRegistry, - ExchangeRegistry exchangeRegistry, AMQProtocolSession session, + public void methodReceived(AMQProtocolSession session, AMQMethodEvent<ClusterPingBody> evt) throws AMQException { MemberHandle peer = new SimpleMemberHandle(evt.getMethod().broker); Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ExtendedHandler.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ExtendedHandler.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ExtendedHandler.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ExtendedHandler.java Fri Jan 19 14:19:51 2007 @@ -38,18 +38,18 @@ _base = base; } - public void methodReceived(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + public void methodReceived(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { - preHandle(stateMgr, session, evt); - _base.methodReceived(stateMgr, queues, exchanges, session, evt); - postHandle(stateMgr, session, evt); + preHandle(session, evt); + _base.methodReceived(session, evt); + postHandle(session, evt); } - void preHandle(AMQStateManager stateMgr, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + void preHandle(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { } - void postHandle(AMQStateManager stateMgr, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + void postHandle(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { } } Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/NullListener.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/NullListener.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/NullListener.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/NullListener.java Fri Jan 19 14:19:51 2007 @@ -31,7 +31,7 @@ public class NullListener<T extends AMQMethodBody> implements StateAwareMethodListener<T> { - public void methodReceived(AMQStateManager stateManager, QueueRegistry queueRegistry, ExchangeRegistry exchangeRegistry, AMQProtocolSession protocolSession, AMQMethodEvent<T> evt) throws AMQException + public void methodReceived(AMQProtocolSession protocolSession, AMQMethodEvent<T> evt) throws AMQException { } } Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/PeerHandler.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/PeerHandler.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/PeerHandler.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/PeerHandler.java Fri Jan 19 14:19:51 2007 @@ -47,14 +47,14 @@ _client = client; } - protected void peer(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + protected void peer(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { - _peer.methodReceived(stateMgr, queues, exchanges, session, evt); + _peer.methodReceived(session, evt); } - protected void client(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + protected void client(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { - _client.methodReceived(stateMgr, queues, exchanges, session, evt); + _client.methodReceived(session, evt); } } Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/QueueNameGenerator.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/QueueNameGenerator.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/QueueNameGenerator.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/QueueNameGenerator.java Fri Jan 19 14:19:51 2007 @@ -41,12 +41,11 @@ _handler = handler; } - protected void peer(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<QueueDeclareBody> evt) throws AMQException + protected void peer(AMQProtocolSession session, AMQMethodEvent<QueueDeclareBody> evt) throws AMQException { } - protected void client(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, - AMQProtocolSession session, AMQMethodEvent<QueueDeclareBody> evt) + protected void client(AMQProtocolSession session, AMQMethodEvent<QueueDeclareBody> evt) throws AMQException { setName(evt.getMethod());//need to set the name before propagating this method Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteCancelHandler.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteCancelHandler.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteCancelHandler.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteCancelHandler.java Fri Jan 19 14:19:51 2007 @@ -37,10 +37,10 @@ { private final Logger _logger = Logger.getLogger(RemoteCancelHandler.class); - public void methodReceived(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<MessageCancelBody> evt) throws AMQException + public void methodReceived(AMQProtocolSession session, AMQMethodEvent<MessageCancelBody> evt) throws AMQException { //By convention, consumers setup between brokers use the queue name as the consumer tag: - AMQQueue queue = queues.getQueue(evt.getMethod().getDestination()); + AMQQueue queue = session.getQueueRegistry().getQueue(evt.getMethod().getDestination()); if (queue instanceof ClusteredQueue) { ((ClusteredQueue) queue).removeRemoteSubscriber(ClusteredProtocolSession.getSessionPeer(session)); Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/RemoteConsumeHandler.java Fri Jan 19 14:19:51 2007 @@ -42,9 +42,9 @@ { private final Logger _logger = Logger.getLogger(RemoteConsumeHandler.class); - public void methodReceived(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<MessageConsumeBody> evt) throws AMQException + public void methodReceived(AMQProtocolSession session, AMQMethodEvent<MessageConsumeBody> evt) throws AMQException { - AMQQueue queue = queues.getQueue(evt.getMethod().queue); + AMQQueue queue = session.getQueueRegistry().getQueue(evt.getMethod().queue); if (queue instanceof ClusteredQueue) { ((ClusteredQueue) queue).addRemoteSubcriber(ClusteredProtocolSession.getSessionPeer(session)); Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingConsumeHandler.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingConsumeHandler.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingConsumeHandler.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingConsumeHandler.java Fri Jan 19 14:19:51 2007 @@ -46,17 +46,17 @@ super(groupMgr, base(), policy); } - protected void replicate(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<MessageConsumeBody> evt) throws AMQException + protected void replicate(AMQProtocolSession session, AMQMethodEvent<MessageConsumeBody> evt) throws AMQException { //only replicate if the queue in question is a shared queue - if (isShared(queues.getQueue(evt.getMethod().queue))) + if (isShared(session.getQueueRegistry().getQueue(evt.getMethod().queue))) { - super.replicate(stateMgr, queues, exchanges, session, evt); + super.replicate(session, evt); } else { _logger.info(new LogMessage("Handling consume for private queue ({0}) locally", evt.getMethod())); - local(stateMgr, queues, exchanges, session, evt); + local(session, evt); _logger.info(new LogMessage("Handled consume for private queue ({0}) locally", evt.getMethod())); } Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java Fri Jan 19 14:19:51 2007 @@ -65,51 +65,45 @@ _policy = policy; } - protected void peer(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + protected void peer(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { - local(stateMgr, queues, exchanges, session, evt); + local(session, evt); _logger.debug(new LogMessage("Handled {0} locally", evt.getMethod())); } - protected void client(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + protected void client(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { - replicate(stateMgr, queues, exchanges, session, evt); + replicate(session, evt); } - protected void replicate(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + protected void replicate(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { if (_policy == null) { //asynch delivery _groupMgr.broadcast(new SimpleSendable(evt.getMethod())); - local(stateMgr, queues, exchanges, session, evt); + local(session, evt); } else { - Callback callback = new Callback(stateMgr, queues, exchanges, session, evt); + Callback callback = new Callback(session, evt); _groupMgr.broadcast(new SimpleSendable(evt.getMethod()), _policy, callback); } _logger.debug(new LogMessage("Replicated {0} to peers", evt.getMethod())); } - protected void local(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException + protected void local(AMQProtocolSession session, AMQMethodEvent<A> evt) throws AMQException { - _base.methodReceived(stateMgr, queues, exchanges, session, evt); + _base.methodReceived(session, evt); } private class Callback implements GroupResponseHandler { - private final AMQStateManager _stateMgr; - private final QueueRegistry _queues; - private final ExchangeRegistry _exchanges; private final AMQProtocolSession _session; private final AMQMethodEvent<A> _evt; - Callback(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<A> evt) + Callback(AMQProtocolSession session, AMQMethodEvent<A> evt) { - _stateMgr = stateMgr; - _queues = queues; - _exchanges = exchanges; _session = session; _evt = evt; } @@ -118,7 +112,7 @@ { try { - local(_stateMgr, _queues, _exchanges, _session, _evt); + local(_session, _evt); _logger.debug(new LogMessage("Handled {0} locally, in response to completion of replication", _evt.getMethod())); } catch (AMQException e) Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappedListener.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappedListener.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappedListener.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappedListener.java Fri Jan 19 14:19:51 2007 @@ -42,11 +42,11 @@ _primary = check(primary); } - public void methodReceived(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent<T> evt) throws AMQException + public void methodReceived(AMQProtocolSession session, AMQMethodEvent<T> evt) throws AMQException { - _pre.methodReceived(stateMgr, queues, exchanges, session, evt); - _primary.methodReceived(stateMgr, queues, exchanges, session, evt); - _post.methodReceived(stateMgr, queues, exchanges, session, evt); + _pre.methodReceived(session, evt); + _primary.methodReceived(session, evt); + _post.methodReceived(session, evt); } private static <T extends AMQMethodBody> StateAwareMethodListener<T> check(StateAwareMethodListener<T> in) Modified: incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java?view=diff&rev=497974&r1=497973&r2=497974 ============================================================================== --- incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java (original) +++ incubator/qpid/branches/qpid.0-9/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java Fri Jan 19 14:19:51 2007 @@ -81,7 +81,7 @@ _localRecorders.put(ExchangeDeleteBody.class, new ExchangeDeleteRecorder()); } - public void methodReceived(AMQStateManager stateMgr, QueueRegistry queues, ExchangeRegistry exchanges, AMQProtocolSession session, AMQMethodEvent evt) throws AMQException + public void methodReceived(AMQProtocolSession session, AMQMethodEvent evt) throws AMQException { _logger.debug(new LogMessage("Replay store received {0}", evt.getMethod())); AMQMethodBody request = evt.getMethod();
