diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-05-09 16:34:53 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-05-09 16:34:53 +0000 |
| commit | 6ad1270085d8c3c36806697c55eae530adbf5908 (patch) | |
| tree | 70872a14236200fea91ee68040643d79de6785ed /qpid/java/broker-plugins | |
| parent | 49d68d0a1b2fb706ca8d356bb7cde5d1e6e86778 (diff) | |
| download | qpid-python-6ad1270085d8c3c36806697c55eae530adbf5908.tar.gz | |
QPID-5574 : [Java Broker] remove redundant state transitions
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1593576 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
3 files changed, 1 insertions, 22 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java index 0b31bdbc14..5708e27e33 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java @@ -140,13 +140,6 @@ public class ACLFileAccessControlProviderImpl } } - @StateTransition(currentState = {State.ACTIVE, State.QUIESCED}, desiredState = State.STOPPED) - private void doStop() - { - close(); - _state.set(State.STOPPED); - } - @Override protected void onClose() { @@ -160,7 +153,7 @@ public class ACLFileAccessControlProviderImpl _state.set(State.QUIESCED); } - @StateTransition(currentState = {State.ACTIVE, State.QUIESCED, State.STOPPED, State.ERRORED}, desiredState = State.DELETED) + @StateTransition(currentState = {State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED) private void doDelete() { close(); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 881d359e9b..47a62f2962 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -136,13 +136,6 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem setCurrentState(State.ACTIVE); } - @StateTransition(currentState = State.ACTIVE, desiredState = State.STOPPED) - private void doStop() - { - close(); - setCurrentState(State.STOPPED); - } - @Override protected void onClose() { diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java index 9d1cd8df59..4b4b78decc 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java @@ -221,13 +221,6 @@ public class JMXManagementPluginImpl return port.getAvailableProtocols().contains(Protocol.RMI); } - @StateTransition( currentState = State.ACTIVE, desiredState = State.STOPPED ) - private void doStop() - { - close(); - setCurrentState(State.STOPPED); - } - @Override protected void onClose() { |