From 2c60d3390a322642b1dcd64f59612dc6ae1bb760 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 18 Apr 2014 22:38:03 +0000 Subject: 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 --- .../security/access/plugins/ACLFileAccessControlProviderFactory.java | 2 +- .../security/access/plugins/ACLFileAccessControlProviderImpl.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'qpid/java/broker-plugins/access-control/src') 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 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 attributes) + public ACLFileAccessControlProviderImpl(Map attributes, Broker broker) { super(parentsMap(broker), attributes, broker.getTaskExecutor()); -- cgit v1.2.1