summaryrefslogtreecommitdiff
path: root/qpid/java/broker-core
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-01-27 10:40:31 +0000
committerKeith Wall <kwall@apache.org>2014-01-27 10:40:31 +0000
commit616c55cbeb855e9fbf7c10906be2ff3e621caf0e (patch)
treeb1929df4fb6e0fdc99eaeba0f84024c6452dc173 /qpid/java/broker-core
parent7d3e48dc2acf7ca77f044ac34f2063c5a0bf0692 (diff)
downloadqpid-python-616c55cbeb855e9fbf7c10906be2ff3e621caf0e.tar.gz
QPID-5514: [Java Broker Management] Close the AMQP transport on deletion of the port too.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1561631 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core')
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
index 3e7d03b5ac..882335626d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
@@ -311,7 +311,11 @@ public class PortAdapter extends AbstractAdapter implements Port
{
if (state == State.INITIALISING || state == State.ACTIVE || state == State.STOPPED || state == State.QUIESCED || state == State.ERRORED)
{
- return _state.compareAndSet(state, State.DELETED);
+ if( _state.compareAndSet(state, State.DELETED))
+ {
+ onStop();
+ return true;
+ }
}
else
{