From 388d42d6be196afb5f9803278a45f46199dc9e30 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/qpid@951158 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/security/access/plugins/SimpleXML.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'java/broker-plugins/simple-xml/src') diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java index 26a5c132f9..8c38c6e76c 100644 --- a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java +++ b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java @@ -52,8 +52,16 @@ public class SimpleXML extends AbstractPlugin { public SimpleXML newInstance(ConfigurationPlugin config) throws ConfigurationException { + SimpleXMLConfiguration configuration = config.getConfiguration(SimpleXMLConfiguration.class); + + // If there is no configuration for this plugin then don't load it. + if (configuration == null) + { + return null; + } + SimpleXML plugin = new SimpleXML(); - plugin.configure(config); + plugin.configure(configuration); return plugin; } @@ -70,16 +78,13 @@ public class SimpleXML extends AbstractPlugin public void configure(ConfigurationPlugin config) throws ConfigurationException { - _config = config.getConfiguration(SimpleXMLConfiguration.class); + super.configure(config); SimpleXMLConfiguration configuration = (SimpleXMLConfiguration) _config; - if (isConfigured()) - { - _users = new ConcurrentHashMap(); + _users = new ConcurrentHashMap(); - processConfig(configuration.getConfiguration()); - } + processConfig(configuration.getConfiguration()); } private void processConfig(Configuration config) -- cgit v1.2.1