diff options
Diffstat (limited to 'java/broker-core/src/main/java/org/apache/qpid/server/model')
6 files changed, 2 insertions, 55 deletions
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java index fab9d95159..d3741cd846 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java @@ -159,7 +159,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im @ManagedAttributeField( afterSet = "attainStateIfResolved" ) private State _desiredState; private boolean _openComplete; - private State _state = State.UNINITIALIZED; + private volatile State _state = State.UNINITIALIZED; protected static Map<Class<? extends ConfiguredObject>, ConfiguredObject<?>> parentsMap(ConfiguredObject<?>... parents) { @@ -953,7 +953,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im } @Override - public Object getAttribute(String name) + public final Object getAttribute(String name) { ConfiguredObjectAttribute<X,?> attr = (ConfiguredObjectAttribute<X, ?>) _attributeTypes.get(name); if(attr != null && (attr.isAutomated() || attr.isDerived())) diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java index 4d0b6ef303..3e662fac32 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java @@ -71,16 +71,6 @@ public abstract class AbstractPluginAdapter<X extends Plugin<X>> extends Abstrac } @Override - public Object getAttribute(String name) - { - if (STATE.equals(name)) - { - return getState(); - } - return super.getAttribute(name); - } - - @Override protected void authoriseSetDesiredState(State desiredState) throws AccessControlException { if(desiredState == State.DELETED) diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java index a82c0de7e9..c96f4c0849 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java @@ -31,7 +31,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.concurrent.atomic.AtomicReference; import org.apache.log4j.Logger; @@ -51,7 +50,6 @@ import org.apache.qpid.server.security.access.Operation; import org.apache.qpid.server.security.auth.UsernamePrincipal; import org.apache.qpid.server.security.group.FileGroupDatabase; import org.apache.qpid.server.security.group.GroupPrincipal; -import org.apache.qpid.server.util.MapValueConverter; public class FileBasedGroupProviderImpl extends AbstractConfiguredObject<FileBasedGroupProviderImpl> implements FileBasedGroupProvider<FileBasedGroupProviderImpl> @@ -198,17 +196,6 @@ public class FileBasedGroupProviderImpl } @Override - public Object getAttribute(String name) - { - if (STATE.equals(name)) - { - return getState(); - } - - return super.getAttribute(name); - } - - @Override public <C extends ConfiguredObject> C addChild(Class<C> childClass, Map<String, Object> attributes, ConfiguredObject... otherParents) { diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java index 68660d8f81..f2be4fd861 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java @@ -115,16 +115,6 @@ public class FileSystemPreferencesProviderImpl return Collections.emptySet(); } - @Override - public Object getAttribute(String name) - { - if (STATE.equals(name)) - { - return getState(); - } - return super.getAttribute(name); - } - protected void onClose() { if(_store != null) diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java index c3b8a8798b..7c9b439e93 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java @@ -109,16 +109,6 @@ final class SessionAdapter extends AbstractConfiguredObject<SessionAdapter> impl } @Override - public Object getAttribute(String name) - { - if(name.equals(PRODUCER_FLOW_BLOCKED)) - { - return _session.getBlocking(); - } - return super.getAttribute(name); //TODO - Implement - } - - @Override public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz) { if(clazz == org.apache.qpid.server.model.Consumer.class) diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java index fd70a96c5c..c0aa99a7d6 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java @@ -310,16 +310,6 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo } } - @Override - public Object getAttribute(String name) - { - if(STATE.equals(name)) - { - return getState(); - } - return super.getAttribute(name); - } - @StateTransition(currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED ) private void doDelete() { |