You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/11/03 16:33:05 UTC
svn commit: r1767926 - in /qpid/java/branches/6.1.x: ./
broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
Author: orudyy
Date: Thu Nov 3 16:33:05 2016
New Revision: 1767926
URL: http://svn.apache.org/viewvc?rev=1767926&view=rev
Log:
QPID-7490: [Java Broker] Stop CreditCreditManager from spuriously notifying subscribers of credit increases
merged from trunk using
svn merge -c 1767848 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 3 16:33:05 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847,1767882,1767914
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767848,1767882,1767914
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java?rev=1767926&r1=1767925&r2=1767926&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java (original)
+++ qpid/java/branches/6.1.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java Thu Nov 3 16:33:05 2016
@@ -47,30 +47,22 @@ public class CreditCreditManager extends
public synchronized void addCredit(final long messageCredit, final long bytesCredit)
{
- boolean notifyIncrease = true;
if(_messageCredit >= 0L && messageCredit > 0L)
{
- notifyIncrease = _messageCredit != 0L;
_messageCredit += messageCredit;
}
-
+ boolean notifyIncrease = false;
if(_bytesCredit >= 0L && bytesCredit > 0L)
{
- notifyIncrease = notifyIncrease && bytesCredit>0;
+ notifyIncrease = _messageCredit != 0L && bytesCredit > 0L;
_bytesCredit += bytesCredit;
-
- }
- else
- {
- notifyIncrease = false;
}
if(!setSuspended(!hasCredit()) && notifyIncrease)
{
notifyIncreaseBytesCredit();
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org