Author: orudyy
Date: Thu Sep 25 11:44:19 2014
New Revision: 1627524
URL: http://svn.apache.org/r1627524
Log:
QPID-6114: Remove redundant overridden getAttribute(String) method from CO and
make _state field volatile
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
Thu Sep 25 11:44:19 2014
@@ -895,16 +895,6 @@ public abstract class AbstractExchange<T
}
@Override
- public Object getAttribute(final String name)
- {
- if(ConfiguredObject.STATE.equals(name))
- {
- return getState();
- }
- return super.getAttribute(name);
- }
-
- @Override
protected void authoriseSetAttributes(ConfiguredObject<?> modified,
Set<String> attributes) throws AccessControlException
{
_virtualHost.getSecurityManager().authoriseUpdate(this);
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Thu Sep 25 11:44:19 2014
@@ -159,7 +159,7 @@ public abstract class AbstractConfigured
@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 AbstractConfigured
}
@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()))
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
Thu Sep 25 11:44:19 2014
@@ -71,16 +71,6 @@ public abstract class AbstractPluginAdap
}
@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)
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
Thu Sep 25 11:44:19 2014
@@ -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.a
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)
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
Thu Sep 25 11:44:19 2014
@@ -115,16 +115,6 @@ public class FileSystemPreferencesProvid
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)
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
Thu Sep 25 11:44:19 2014
@@ -109,16 +109,6 @@ final class SessionAdapter extends Abstr
}
@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)
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
Thu Sep 25 11:44:19 2014
@@ -310,16 +310,6 @@ abstract public class AbstractPort<X ext
}
}
- @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()
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Thu Sep 25 11:44:19 2014
@@ -573,17 +573,6 @@ public abstract class AbstractQueue<X ex
return new ArrayList<String>(_arguments.keySet());
}
- @Override
- public Object getAttribute(String name)
- {
- if(STATE.equals(name))
- {
- return State.ACTIVE; // TODO
- }
-
- return super.getAttribute(name);
- }
-
public String getOwner()
{
if(_exclusiveOwner != null)
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
Thu Sep 25 11:44:19 2014
@@ -514,12 +514,6 @@ class QueueConsumerImpl
}
@Override
- public Object getAttribute(final String name)
- {
- return super.getAttribute(name);
- }
-
- @Override
public String toLogString()
{
String logString;
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
Thu Sep 25 11:44:19 2014
@@ -86,17 +86,6 @@ public class FileKeyStoreImpl extends Ab
validateKeyStoreAttributes(this);
}
- @Override
- public Object getAttribute(String name)
- {
- if(KeyStore.STATE.equals(name))
- {
- return getState();
- }
-
- return super.getAttribute(name);
- }
-
@StateTransition(currentState = {State.ACTIVE, State.ERRORED},
desiredState = State.DELETED)
protected void doDelete()
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
Thu Sep 25 11:44:19 2014
@@ -203,16 +203,6 @@ public class FileTrustStoreImpl extends
}
@Override
- public Object getAttribute(String name)
- {
- if(STATE.equals(name))
- {
- return getState();
- }
-
- return super.getAttribute(name);
- }
- @Override
public String getPath()
{
return _path;
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
Thu Sep 25 11:44:19 2014
@@ -183,17 +183,6 @@ public class NonJavaKeyStoreImpl extends
validateKeyStoreAttributes(this);
}
- @Override
- public Object getAttribute(String name)
- {
- if (KeyStore.STATE.equals(name))
- {
- return getState();
- }
-
- return super.getAttribute(name);
- }
-
@StateTransition(currentState = {State.ACTIVE, State.ERRORED},
desiredState = State.DELETED)
protected void doDelete()
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
Thu Sep 25 11:44:19 2014
@@ -171,17 +171,6 @@ public class NonJavaTrustStoreImpl
validateTrustStoreAttributes(this);
}
- @Override
- public Object getAttribute(String name)
- {
- if (KeyStore.STATE.equals(name))
- {
- return getState();
- }
-
- return super.getAttribute(name);
- }
-
@StateTransition(currentState = {State.ACTIVE, State.ERRORED},
desiredState = State.DELETED)
protected void doDelete()
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
Thu Sep 25 11:44:19 2014
@@ -231,16 +231,6 @@ public abstract class AbstractAuthentica
}
@Override
- public Object getAttribute(final String name)
- {
- if(STATE.equals(name))
- {
- return getState();
- }
- return super.getAttribute(name);
- }
-
- @Override
public final List<String> getSecureOnlyMechanisms()
{
return _secureOnlyMechanisms;
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java
Thu Sep 25 11:44:19 2014
@@ -140,12 +140,6 @@ class ScramAuthUser extends AbstractConf
}
@Override
- public Object getAttribute(final String name)
- {
- return super.getAttribute(name);
- }
-
- @Override
public String getPassword()
{
return _password;
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1627524&r1=1627523&r2=1627524&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Thu Sep 25 11:44:19 2014
@@ -1032,17 +1032,6 @@ public abstract class AbstractVirtualHos
txn.commit();
}
-
- @Override
- public Object getAttribute(String name)
- {
- if(STATE.equals(name))
- {
- return getState();
- }
- return super.getAttribute(name);
- }
-
@Override
public Collection<String> getSupportedExchangeTypes()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
