From 3e9848f1727cc948972705e60fe4b8adcb9595ac Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Fri, 27 Feb 2009 17:01:26 +0000 Subject: QPID-1701: fixed potential deadlock on connection close git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748594 13f79535-47bb-0310-9956-ffa450edef68 --- java/common/src/main/java/org/apache/qpid/transport/Connection.java | 2 +- java/common/src/main/java/org/apache/qpid/transport/Session.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'java') diff --git a/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/java/common/src/main/java/org/apache/qpid/transport/Connection.java index adaf2ccd37..7fcb51161d 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/Connection.java +++ b/java/common/src/main/java/org/apache/qpid/transport/Connection.java @@ -74,7 +74,7 @@ public class Connection extends ConnectionInvoker final private Map channels = new HashMap(); private State state = NEW; - private Object lock = new Object(); + final private Object lock = new Object(); private long timeout = 60000; private ConnectionListener listener = new DefaultConnectionListener(); private ConnectionException error = null; diff --git a/java/common/src/main/java/org/apache/qpid/transport/Session.java b/java/common/src/main/java/org/apache/qpid/transport/Session.java index e3540cfd05..9920b67d79 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/Session.java +++ b/java/common/src/main/java/org/apache/qpid/transport/Session.java @@ -854,9 +854,9 @@ public class Session extends SessionInvoker { throw new SessionException("close() timed out"); } - - connection.removeSession(this); } + + connection.removeSession(this); } public void exception(Throwable t) -- cgit v1.2.1