summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2010-03-10 14:38:07 +0000
committerRobert Gemmell <robbie@apache.org>2010-03-10 14:38:07 +0000
commitb2f3693bc1833a32e101cb8018f61d12d3067cfb (patch)
tree450ae5d24b5265631134f010be5709df6e9a5cec
parent9fa1fc01ebc1a271bb365ebf8c3e50228c7a55b7 (diff)
downloadqpid-python-b2f3693bc1833a32e101cb8018f61d12d3067cfb.tar.gz
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
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java2
1 files changed, 1 insertions, 1 deletions
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));
}