From 7b2de58298ec526db3025f6e40d032b35ba926c1 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Thu, 12 Mar 2015 16:29:47 +0000 Subject: QPID-6447 : [Java AMQP 1.0 Client] Use endpoint lock in Transaction Controller git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666241 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/amqp_1_0/client/TransactionController.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java index 7bf143cf4b..4a4cce1146 100644 --- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java +++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java @@ -113,13 +113,14 @@ public class TransactionController implements DeliveryStateHandler private void waitForResponse() throws LinkDetachedException { - synchronized (this) + final Object lock = _endpoint.getLock(); + synchronized (lock) { while(!_received && !_endpoint.isDetached()) { try { - wait(); + lock.wait(); } catch (InterruptedException e) { @@ -133,12 +134,16 @@ public class TransactionController implements DeliveryStateHandler } } - private synchronized void remoteDetached(Detach detach) + private void remoteDetached(Detach detach) { - if(detach != null && detach.getError() != null) + final Object lock = _endpoint.getLock(); + synchronized (lock) { - _error = detach.getError(); - notifyAll(); + if (detach != null && detach.getError() != null) + { + _error = detach.getError(); + lock.notifyAll(); + } } } -- cgit v1.2.1