From 378a7020fdb911c2009fa5846f554cd8dbf14b39 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Thu, 3 Jun 2010 21:26:59 +0000 Subject: Remove Plugin.isConfigured Only configured plugins should be created git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@951158 13f79535-47bb-0310-9956-ffa450edef68 --- .../security/access/plugins/AccessControl.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'qpid/java/broker-plugins/access-control/src/main') diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java index 98fc198cc8..69e3218bf5 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java @@ -60,8 +60,16 @@ public class AccessControl extends AbstractPlugin public AccessControl newInstance(ConfigurationPlugin config) throws ConfigurationException { + AccessControlConfiguration configuration = config.getConfiguration(AccessControlConfiguration.class); + + // If there is no configuration for this plugin then don't load it. + if (configuration == null) + { + return null; + } + AccessControl plugin = new AccessControl(); - plugin.configure(config); + plugin.configure(configuration); return plugin; } }; @@ -109,14 +117,12 @@ public class AccessControl extends AbstractPlugin public void configure(ConfigurationPlugin config) throws ConfigurationException { - _config = config.getConfiguration(AccessControlConfiguration.class); + super.configure(config); + AccessControlConfiguration accessConfig = (AccessControlConfiguration) _config; - - if (isConfigured()) - { - String fileName = accessConfig.getFileName(); - File aclFile = new File(fileName); - parseFile(aclFile); - } + + String fileName = accessConfig.getFileName(); + File aclFile = new File(fileName); + parseFile(aclFile); } } -- cgit v1.2.1