diff options
Diffstat (limited to 'qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java')
-rw-r--r-- | qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java index b10656d622..010d1652f0 100644 --- a/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java +++ b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java @@ -20,21 +20,22 @@ */ package org.apache.qpid.server.security.access.plugins; -import java.util.Arrays; -import java.util.List; - import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; + import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; import org.apache.qpid.server.security.Result; import org.apache.qpid.server.security.access.config.FirewallRule; +import java.util.Arrays; +import java.util.List; + public class FirewallConfiguration extends ConfigurationPlugin { - CompositeConfiguration _finalConfig; + private CompositeConfiguration _finalConfig; public static final ConfigurationPluginFactory FACTORY = new ConfigurationPluginFactory() { @@ -63,7 +64,7 @@ public class FirewallConfiguration extends ConfigurationPlugin public Result getDefaultAction() { - String defaultAction = _configuration.getString("[@default-action]"); + String defaultAction = getConfig().getString("[@default-action]"); if (defaultAction == null) { return Result.ABSTAIN; @@ -84,8 +85,8 @@ public class FirewallConfiguration extends ConfigurationPlugin public void validateConfiguration() throws ConfigurationException { // Valid Configuration either has xml links to new files - _finalConfig = new CompositeConfiguration(_configuration); - List subFiles = _configuration.getList("xml[@fileName]"); + _finalConfig = new CompositeConfiguration(getConfig()); + List subFiles = getConfig().getList("xml[@fileName]"); for (Object subFile : subFiles) { _finalConfig.addConfiguration(new XMLConfiguration((String) subFile)); @@ -93,7 +94,7 @@ public class FirewallConfiguration extends ConfigurationPlugin // all rules must have an access attribute or a default value if (_finalConfig.getList("rule[@access]").size() == 0 && - _configuration.getString("[@default-action]") == null) + getConfig().getString("[@default-action]") == null) { throw new ConfigurationException("No rules or default-action found in firewall configuration."); } |