diff options
author | Keith Wall <kwall@apache.org> | 2012-01-18 08:33:39 +0000 |
---|---|---|
committer | Keith Wall <kwall@apache.org> | 2012-01-18 08:33:39 +0000 |
commit | d983e59b8ee826fa75c817b489d60e60fd80d7a3 (patch) | |
tree | 16d7248024245c259aa4aa7c2bc178554b4625f6 /java/broker/src/main/java/org/apache/qpid/server | |
parent | 7ba88a8d4158c1af37e83086a4830c8974995b10 (diff) | |
download | qpid-python-d983e59b8ee826fa75c817b489d60e60fd80d7a3.tar.gz |
QPID-3756: ManagedConnectionMBeanTest.testChannels occasionally fails on 0-10 spawned profiles
This problem is caused by the connection mbean being deregistered too late (as the TCP/IP socket)
is closed, thus creating a race between the client using JMX to observe connection state, and the
unregistering of the bean. This patch changes the 0-10 code path to unregister the bean on receipt
of ConnectionClose and before ConnectionCloseOkay is sent to the client.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1232785 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/main/java/org/apache/qpid/server')
-rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java | 50 |
1 files changed, 31 insertions, 19 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java index ab07ed20f6..04cdbf2b25 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java +++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java @@ -62,6 +62,8 @@ import org.apache.qpid.transport.ExecutionException; import org.apache.qpid.transport.Method; import org.apache.qpid.transport.ProtocolEvent; import org.apache.qpid.transport.Session; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ServerConnection extends Connection implements Managable, AMQConnectionModel, LogSubject, AuthorizationHolder { @@ -123,6 +125,7 @@ public class ServerConnection extends Connection implements Managable, AMQConnec { _virtualHost.getConnectionRegistry().deregisterConnection(this); } + unregisterConnectionMbean(); } if (state == State.CLOSED) @@ -161,15 +164,7 @@ public class ServerConnection extends Connection implements Managable, AMQConnec initialiseStatistics(); - try - { - _mBean = new ServerConnectionMBean(this); - _mBean.register(); - } - catch (JMException jme) - { - log.error("Unable to create mBean for ServerConnection",jme); - } + registerConnectionMbean(); } public void setConnectionConfig(final ConnectionConfig config) @@ -285,11 +280,7 @@ public class ServerConnection extends Connection implements Managable, AMQConnec public void close(AMQConstant cause, String message) throws AMQException { closeSubscriptions(); - if (_mBean != null) - { - _mBean.unregister(); - _mBean = null; - } + unregisterConnectionMbean(); ConnectionCloseCode replyCode = ConnectionCloseCode.NORMAL; try { @@ -433,11 +424,6 @@ public class ServerConnection extends Connection implements Managable, AMQConnec public void closed() { closeSubscriptions(); - if (_mBean != null) - { - _mBean.unregister(); - _mBean = null; - } super.closed(); } @@ -483,4 +469,30 @@ public class ServerConnection extends Connection implements Managable, AMQConnec _mBean.notifyClients("Channel count (" + channelsCount + ") has reached the threshold value"); } } + + private void registerConnectionMbean() + { + try + { + _mBean = new ServerConnectionMBean(this); + _mBean.register(); + } + catch (JMException jme) + { + log.error("Unable to register mBean for ServerConnection", jme); + } + } + + private void unregisterConnectionMbean() + { + if (_mBean != null) + { + if (log.isDebugEnabled()) + { + log.debug("Unregistering mBean for ServerConnection" + _mBean); + } + _mBean.unregister(); + _mBean = null; + } + } } |