summaryrefslogtreecommitdiff
path: root/java/broker-plugins/access-control
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-04-18 22:38:03 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-04-18 22:38:03 +0000
commit5918405ad407327a52afd055cf2e4658590e5f5a (patch)
tree35b1cc456e22bc01e11c2c10b36a14bb6e88a194 /java/broker-plugins/access-control
parent592442ad68d08ecd8ae715c387be729f1e546036 (diff)
downloadqpid-python-5918405ad407327a52afd055cf2e4658590e5f5a.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/qpid@1588586 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins/access-control')
-rw-r--r--java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java2
-rw-r--r--java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java b/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java
index f20d468a14..9ba4618b29 100644
--- a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java
+++ b/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/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 fa52f33ece..be9642795b 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
@@ -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());