Author: rgodfrey
Date: Wed Jan 8 22:07:37 2014
New Revision: 1556656
URL: http://svn.apache.org/r1556656
Log:
Merged r1556593 to 0.26
Modified:
qpid/branches/0.26/qpid/java/ (props changed)
qpid/branches/0.26/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
Propchange: qpid/branches/0.26/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1556593
Modified:
qpid/branches/0.26/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1556656&r1=1556655&r2=1556656&view=diff
==============================================================================
---
qpid/branches/0.26/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
(original)
+++
qpid/branches/0.26/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
Wed Jan 8 22:07:37 2014
@@ -212,10 +212,21 @@ public class ServerSessionDelegate exten
{
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 exten
if(queue.getAuthorizationHolder() ==
session)
{
queue.setAuthorizationHolder(null);
- queue.setExclusiveOwningSession(null);
}
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
