diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-04-18 22:38:03 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-04-18 22:38:03 +0000 |
| commit | 2c60d3390a322642b1dcd64f59612dc6ae1bb760 (patch) | |
| tree | ced06903f8f7b138929ee97010905298251ab289 /qpid/java/broker-plugins/access-control | |
| parent | 178745059c1265f8cae71f8b19caf448b580afb0 (diff) | |
| download | qpid-python-2c60d3390a322642b1dcd64f59612dc6ae1bb760.tar.gz | |
QPID-5578 : [Java Broker] Tidy up - minimize use of MapValueConverter, make constructors consistent across ConfiguredObjects
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588586 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/access-control')
2 files changed, 2 insertions, 3 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java index f20d468a14..9ba4618b29 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java @@ -47,7 +47,7 @@ public class ACLFileAccessControlProviderFactory extends AbstractConfiguredObjec public ACLFileAccessControlProviderImpl createInstance(final Map<String, Object> attributes, final ConfiguredObject<?>... parents) { - return new ACLFileAccessControlProviderImpl(getParent(Broker.class,parents), attributes); + return new ACLFileAccessControlProviderImpl(attributes, getParent(Broker.class,parents)); } } 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 fa52f33ece..be9642795b 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 @@ -56,8 +56,7 @@ public class ACLFileAccessControlProviderImpl @ManagedAttributeField private String _path; - public ACLFileAccessControlProviderImpl(Broker broker, - Map<String, Object> attributes) + public ACLFileAccessControlProviderImpl(Map<String, Object> attributes, Broker broker) { super(parentsMap(broker), attributes, broker.getTaskExecutor()); |