diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-05-29 11:37:11 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-05-29 11:37:11 +0000 |
| commit | 5a888989bd28402e3271b05bcc32a7410f8d17a2 (patch) | |
| tree | 469fe7c0a7a484cf2663a70d289e342497303f0b /qpid/java/client | |
| parent | 739f8964cdb5baf786759fb900928206a404d3fa (diff) | |
| download | qpid-python-5a888989bd28402e3271b05bcc32a7410f8d17a2.tar.gz | |
QPID-3986: Improved tests and resolved some potential thread-safety issues
Applied patch from Oleksandr Rudyy <orudyy@gmail.com>, Philip Harvey <phil@philharveyonline.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1343675 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java | 4 | ||||
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index c09b438424..92a8f88d28 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -3130,11 +3130,11 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic _ticket = ticket; } - public boolean isBrokerFlowControlled() + public boolean isFlowBlocked() { synchronized (_flowControl) { - return _flowControl.getFlowControl(); + return !_flowControl.getFlowControl(); } } diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java index 06ee651a1e..317c8902be 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java @@ -1408,9 +1408,10 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic sync(); } - public boolean isBrokerFlowControlled() + @Override + public boolean isFlowBlocked() { - return _qpidSession.isFlowControlled(); + return _qpidSession.isFlowBlocked(); } } |