summaryrefslogtreecommitdiff
path: root/qpid/java
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
commite9319047d4f057d5b83e1c9a6492cc872855b589 (patch)
tree7540ebe7fb8e042f18a0cd93fc2c6683ea420370 /qpid/java
parentb4b160bf51863b03402d93f4010e834fb6a75ebd (diff)
downloadqpid-python-e9319047d4f057d5b83e1c9a6492cc872855b589.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@921369 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
index 4cc7e6fce2..9d2f3506cd 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
+++ b/qpid/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));
}