You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/11/29 16:05:12 UTC
svn commit: r1771921 -
/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Author: kwall
Date: Tue Nov 29 16:05:12 2016
New Revision: 1771921
URL: http://svn.apache.org/viewvc?rev=1771921&view=rev
Log:
QPID-7425: [Java Broker] Ensure that on rollback, when resending previously acknowledge messages, that credit is consumed correctly
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1771921&r1=1771920&r2=1771921&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Tue Nov 29 16:05:12 2016
@@ -1280,7 +1280,15 @@ public class AMQChannel
}
else
{
- consumer.getTarget().send(consumer, messageInstance, false);
+ if (messageInstance.makeAcquisitionUnstealable(consumer)
+ && _creditManager.useCreditForMessage(association.getSize()))
+ {
+ consumer.getTarget().send(consumer, messageInstance, false);
+ }
+ else
+ {
+ messageInstance.release(consumer);
+ }
}
}
_resendList.clear();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org