You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/11/03 09:25:33 UTC

svn commit: r1767848 - /qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java

Author: lquack
Date: Thu Nov  3 09:25:32 2016
New Revision: 1767848

URL: http://svn.apache.org/viewvc?rev=1767848&view=rev
Log:
QPID-7490: [Java Broker] Stop CreditCreditManager from spuriously notifying subscribers of credit increases

Modified:
    qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java

Modified: qpid/java/trunk/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/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java?rev=1767848&r1=1767847&r2=1767848&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java Thu Nov  3 09:25:32 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