diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-01-08 22:07:37 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-01-08 22:07:37 +0000 |
| commit | a95a9818e8157edd23bb43a0fe36366869859a69 (patch) | |
| tree | ffdba7d5f1c41f040951fc1c1270702c5a469284 | |
| parent | 60f76685d58fa8cba55f6add930acdc77b72a801 (diff) | |
| download | qpid-python-a95a9818e8157edd23bb43a0fe36366869859a69.tar.gz | |
Merged r1556593 to 0.26
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1556656 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java index 46626e3e92..a0b60ae640 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java @@ -212,10 +212,21 @@ public class ServerSessionDelegate extends SessionDelegate { ServerSession s = (ServerSession) session; queue.setExclusiveOwningSession(s); + + ((ServerSession) session).addSessionCloseTask(new ServerSession.Task() + { + public void doTask(ServerSession session) + { + if(queue.getExclusiveOwningSession() == session) + { + queue.setExclusiveOwningSession(null); + } + } + }); + if(queue.getAuthorizationHolder() == null) { queue.setAuthorizationHolder(s); - queue.setExclusiveOwningSession(s); ((ServerSession) session).addSessionCloseTask(new ServerSession.Task() { public void doTask(ServerSession session) @@ -223,7 +234,6 @@ public class ServerSessionDelegate extends SessionDelegate if(queue.getAuthorizationHolder() == session) { queue.setAuthorizationHolder(null); - queue.setExclusiveOwningSession(null); } } }); |