From b2f3693bc1833a32e101cb8018f61d12d3067cfb Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Wed, 10 Mar 2010 14:38:07 +0000 Subject: QPID-2430: when the AcceptMode=NONE, dont add the MessageAcceptCompletionListener if AcquireMode is not PRE_ACQUIRED, fallback to just using the restorecredit listener if using WINDOW flow mode git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@921369 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/subscription/Subscription_0_10.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/broker/src') diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java index 4cc7e6fce2..9d2f3506cd 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java +++ b/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java @@ -531,7 +531,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)); } -- cgit v1.2.1