You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/01/12 18:43:31 UTC
svn commit: r1724292 - in /qpid/java/trunk/broker-plugins:
amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/
amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/
amqp-1-0-protocol/src/main/java/org/apache/qpid/ser...
Author: kwall
Date: Tue Jan 12 17:43:30 2016
New Revision: 1724292
URL: http://svn.apache.org/viewvc?rev=1724292&view=rev
Log:
QPID-6994: [Java Broker] Run connection delete tasks before disassociating the virtualhost
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java?rev=1724292&r1=1724291&r2=1724292&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java Tue Jan 12 17:43:30 2016
@@ -418,12 +418,13 @@ public class ServerConnection extends Co
@Override
public void closed()
{
+ performDeleteTasks();
+ closeSubscriptions();
+
if(_virtualHost != null)
{
_virtualHost.deregisterConnection(_amqpConnection);
}
- performDeleteTasks();
- closeSubscriptions();
super.closed();
getEventLogger().message(isConnectionLost() ? ConnectionMessages.DROPPED_CONNECTION() : ConnectionMessages.CLOSE());
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java?rev=1724292&r1=1724291&r2=1724292&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java Tue Jan 12 17:43:30 2016
@@ -789,12 +789,13 @@ public class AMQPConnection_0_8
}
finally
{
+ performDeleteTasks();
+
if (_virtualHost != null)
{
_virtualHost.deregisterConnection(this);
}
- performDeleteTasks();
}
}
catch (ConnectionScopedRuntimeException | TransportException e)
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java?rev=1724292&r1=1724291&r2=1724292&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java Tue Jan 12 17:43:30 2016
@@ -277,11 +277,11 @@ public class Connection_1_0 implements C
public void closed()
{
+ performCloseTasks();
if (_vhost != null)
{
_vhost.deregisterConnection(_amqpConnection);
}
- performCloseTasks();
closeReceived();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org