Author: robbie
Date: Sun Mar 27 21:32:02 2011
New Revision: 1086041
URL: http://svn.apache.org/viewvc?rev=1086041&view=rev
Log:
QPID-3162: move unregistration of ServerConnections from the ConnectionRegistry
into the setState() method to ensure it occurs in all cases. Also move
registration into setState().
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java?rev=1086041&r1=1086040&r2=1086041&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
Sun Mar 27 21:32:02 2011
@@ -88,8 +88,18 @@ public class ServerConnection extends Co
_onOpenTask.run();
}
_actor.message(ConnectionMessages.OPEN(getClientId(), "0-10",
true, true));
+
+ getVirtualHost().getConnectionRegistry().registerConnection(this);
}
-
+
+ if (state == State.CLOSE_RCVD || state == State.CLOSED || state ==
State.CLOSING)
+ {
+ if(_virtualHost != null)
+ {
+
_virtualHost.getConnectionRegistry().deregisterConnection(this);
+ }
+ }
+
if (state == State.CLOSED)
{
logClosed();
@@ -126,7 +136,6 @@ public class ServerConnection extends Co
public void setVirtualHost(VirtualHost virtualHost)
{
_virtualHost = virtualHost;
- _virtualHost.getConnectionRegistry().registerConnection(this);
initialiseStatistics();
}
@@ -253,7 +262,6 @@ public class ServerConnection extends Co
// Ignore
}
close(replyCode, message);
- getVirtualHost().getConnectionRegistry().deregisterConnection(this);
}
@Override
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
