You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/03/10 15:38:07 UTC

svn commit: r921369 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java

Author: robbie
Date: Wed Mar 10 14:38:07 2010
New Revision: 921369

URL: http://svn.apache.org/viewvc?rev=921369&view=rev
Log:
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

Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java?rev=921369&r1=921368&r2=921369&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java Wed Mar 10 14:38:07 2010
@@ -531,7 +531,7 @@ public class Subscription_0_10 implement
 
         if(!excludeDueToFederation)
         {
-            if(_acceptMode == MessageAcceptMode.NONE)
+            if(_acceptMode == MessageAcceptMode.NONE && _acquireMode != MessageAcquireMode.PRE_ACQUIRED)
             {
                 xfr.setCompletionListener(new MessageAcceptCompletionListener(this, _session, entry, _flowMode == MessageFlowMode.WINDOW));
             }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org