From eaea4f51a8925a985a4b41447aa70bb859117eaa Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Thu, 6 Aug 2009 16:54:46 +0000 Subject: QPID-2002 : Added exclusive parameter to subscription.setQueue to allow improved logging. Value should be retained in the Subscription for MC display git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@801715 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java | 2 +- .../main/java/org/apache/qpid/server/subscription/Subscription.java | 2 +- .../qpid/server/logging/subjects/SubscriptionLogSubjectTest.java | 2 +- .../java/org/apache/qpid/server/subscription/MockSubscription.java | 3 ++- .../main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java index 763a0506e3..46b2cf8fb4 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java @@ -296,7 +296,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener if (!isDeleted()) { - subscription.setQueue(this); + subscription.setQueue(this, exclusive); _subscriptionList.add(subscription); if (isDeleted()) { diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java index 19eabce9ff..5001b0baf1 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java @@ -46,7 +46,7 @@ public interface Subscription QueueEntry.SubscriptionAcquiredState getOwningState(); - void setQueue(AMQQueue queue); + void setQueue(AMQQueue queue, boolean exclusive); AMQChannel getChannel(); diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java index e217497b7b..fda951616e 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java @@ -63,7 +63,7 @@ public class SubscriptionLogSubjectTest extends AbstractTestLogSubject _acks, _filters, _noLocal, new LimitlessCreditManager()); - _subscription.setQueue(_queue); + _subscription.setQueue(_queue, false); _subject = new SubscriptionLogSubject(_subscription); } diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java index 43152ef780..f5348ce1bb 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java @@ -24,6 +24,7 @@ package org.apache.qpid.server.subscription; import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.server.AMQChannel; +import org.apache.qpid.server.filter.FilterManager; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.QueueEntry; import org.apache.qpid.server.queue.QueueEntry.SubscriptionAcquiredState; @@ -163,7 +164,7 @@ public class MockSubscription implements Subscription return result; } - public void setQueue(AMQQueue queue) + public void setQueue(AMQQueue queue, boolean exclusive) { this.queue = queue; } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java index dd01cb2f8e..418cb99354 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java @@ -56,7 +56,7 @@ public class SubscriptionTestHelper implements Subscription return messages; } - public void setQueue(AMQQueue queue) + public void setQueue(AMQQueue queue, boolean exclusive) { } -- cgit v1.2.1