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/09/09 08:53:23 UTC
svn commit: r1759958 - in
/qpid/java/branches/6.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10:
CreditCreditManager.java WindowCreditManager.java
Author: kwall
Date: Fri Sep 9 08:53:23 2016
New Revision: 1759958
URL: http://svn.apache.org/viewvc?rev=1759958&view=rev
Log:
QPID-7387: [Java Broker] 0-10 Correct synchronization in 0-10 credit managers
Cherry picked the 0-10 changes from r1759837.
Modified:
qpid/java/branches/6.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
qpid/java/branches/6.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java
Modified: qpid/java/branches/6.0.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.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java?rev=1759958&r1=1759957&r2=1759958&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java (original)
+++ qpid/java/branches/6.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java Fri Sep 9 08:53:23 2016
@@ -75,7 +75,7 @@ public class CreditCreditManager extends
}
- public void clearCredit()
+ public synchronized void clearCredit()
{
_bytesCredit = 0l;
_messageCredit = 0l;
@@ -145,18 +145,4 @@ public class CreditCreditManager extends
}
- public synchronized void stop()
- {
- if(_bytesCredit > 0)
- {
- _bytesCredit = 0;
- }
- if(_messageCredit > 0)
- {
- _messageCredit = 0;
- }
-
- }
-
-
}
Modified: qpid/java/branches/6.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java?rev=1759958&r1=1759957&r2=1759958&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java (original)
+++ qpid/java/branches/6.0.x/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java Fri Sep 9 08:53:23 2016
@@ -49,19 +49,19 @@ public class WindowCreditManager extends
}
- public long getMessageCreditLimit()
+ public synchronized long getMessageCreditLimit()
{
return _messageCreditLimit;
}
- public long getMessageCredit()
+ synchronized long getMessageCredit()
{
return _messageCreditLimit == -1L
? Long.MAX_VALUE
: _messageUsed < _messageCreditLimit ? _messageCreditLimit - _messageUsed : 0L;
}
- public long getBytesCredit()
+ synchronized long getBytesCredit()
{
return _bytesCreditLimit == -1L
? Long.MAX_VALUE
@@ -87,7 +87,7 @@ public class WindowCreditManager extends
_bytesUsed -= bytesCredit;
if(_bytesUsed < 0L)
{
- LOGGER.error("Bytes credit used value was negative: "+ _messageUsed);
+ LOGGER.error("Bytes credit used value was negative: "+ _bytesUsed);
_bytesUsed = 0;
}
@@ -192,7 +192,7 @@ public class WindowCreditManager extends
}
}
- public void clearCredit()
+ public synchronized void clearCredit()
{
_bytesCreditLimit = 0l;
_messageCreditLimit = 0l;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org