diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2009-02-27 17:01:26 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2009-02-27 17:01:26 +0000 |
| commit | 28e3be2fce4009422f81616c3baeddf00bc8a740 (patch) | |
| tree | 7fef24ed158b2d88abaf583e2c4348a364ae2f98 /qpid/java/common | |
| parent | 7bd1ee1b36e401aaa64440bc6c3cc029c66365b1 (diff) | |
| download | qpid-python-28e3be2fce4009422f81616c3baeddf00bc8a740.tar.gz | |
QPID-1701: fixed potential deadlock on connection close
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748594 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java | 2 | ||||
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java index adaf2ccd37..7fcb51161d 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java @@ -74,7 +74,7 @@ public class Connection extends ConnectionInvoker final private Map<Integer,Session> channels = new HashMap<Integer,Session>(); 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/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java index e3540cfd05..9920b67d79 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java +++ b/qpid/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) |