diff options
Diffstat (limited to 'java/broker-plugins')
3 files changed, 7 insertions, 15 deletions
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java index 5708e27e33..f0edc59025 100644 --- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java +++ b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java @@ -49,8 +49,6 @@ public class ACLFileAccessControlProviderImpl protected DefaultAccessControl _accessControl; protected final Broker _broker; - private AtomicReference<State> _state = new AtomicReference<>(State.UNINITIALIZED); - @ManagedAttributeField private String _path; @@ -98,12 +96,6 @@ public class ACLFileAccessControlProviderImpl } @Override - public State getState() - { - return _state.get(); - } - - @Override public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz) { return Collections.emptySet(); @@ -116,18 +108,18 @@ public class ACLFileAccessControlProviderImpl if(_broker.isManagementMode()) { - _state.set(_accessControl.validate() ? State.QUIESCED : State.ERRORED); + setState(_accessControl.validate() ? State.QUIESCED : State.ERRORED); } else { try { _accessControl.open(); - _state.set(State.ACTIVE); + setState(State.ACTIVE); } catch (RuntimeException e) { - _state.set(State.ERRORED); + setState(State.ERRORED); if (_broker.isManagementMode()) { LOGGER.warn("Failed to activate ACL provider: " + getName(), e); @@ -150,14 +142,14 @@ public class ACLFileAccessControlProviderImpl @StateTransition(currentState = State.UNINITIALIZED, desiredState = State.QUIESCED) private void startQuiesced() { - _state.set(State.QUIESCED); + setState(State.QUIESCED); } @StateTransition(currentState = {State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED) private void doDelete() { close(); - _state.set(State.DELETED); + setState(State.DELETED); deleted(); } diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 2339cfb000..e07705656a 100644 --- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -140,7 +140,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem } getBroker().getEventLogger().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME)); - setCurrentState(State.ACTIVE); + setState(State.ACTIVE); } @Override diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java index 98c6d9ffe8..a38aa9e349 100644 --- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java +++ b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java @@ -172,7 +172,7 @@ public class JMXManagementPluginImpl new LoggingManagementMBean(LoggingManagementFacade.getCurrentInstance(), _objectRegistry); } _objectRegistry.start(); - setCurrentState(State.ACTIVE); + setState(State.ACTIVE); _allowPortActivation = false; } |