summaryrefslogtreecommitdiff
path: root/java/client
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-05-29 11:37:11 +0000
committerRobert Gemmell <robbie@apache.org>2012-05-29 11:37:11 +0000
commit97ed2eedc0c0545b22ca12cdf855a8d58a16affd (patch)
tree5209790f7b72a51266400d3806c065f9c125fa2a /java/client
parent63091f74ef887fdd60c4198c9b261b5c09d6d388 (diff)
downloadqpid-python-97ed2eedc0c0545b22ca12cdf855a8d58a16affd.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/qpid@1343675 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQSession.java4
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java5
2 files changed, 5 insertions, 4 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index c09b438424..92a8f88d28 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/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/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 06ee651a1e..317c8902be 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/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();
}
}