diff options
Diffstat (limited to 'java/broker-plugins/firewall')
2 files changed, 10 insertions, 14 deletions
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java b/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java index acd74d49f5..6c5ecf1d92 100644 --- a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java +++ b/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java @@ -43,8 +43,8 @@ public class Firewall extends AbstractPlugin { public Firewall newInstance(ConfigurationPlugin config) throws ConfigurationException { - Firewall plugin = new Firewall(config); - plugin.configure(); + Firewall plugin = new Firewall(); + plugin.configure(config); return plugin; } @@ -118,19 +118,16 @@ public class Firewall extends AbstractPlugin } } - public Firewall(ConfigurationPlugin config) - { - _config = config.getConfiguration(FirewallConfiguration.class); - } - public void configure() throws ConfigurationException + public void configure(ConfigurationPlugin config) throws ConfigurationException { - FirewallConfiguration config = (FirewallConfiguration) _config; + _config = config.getConfiguration(FirewallConfiguration.class); + FirewallConfiguration firewallConfiguration = (FirewallConfiguration) _config; if (isConfigured()) { // Get default action - String defaultAction = config.getConfiguration().getString("[@default-action]"); + String defaultAction = firewallConfiguration.getConfiguration().getString("[@default-action]"); if (defaultAction == null) { _default = Result.ABSTAIN; @@ -144,8 +141,8 @@ public class Firewall extends AbstractPlugin _default = Result.DENIED; } - CompositeConfiguration finalConfig = new CompositeConfiguration(config.getConfiguration()); - List subFiles = config.getConfiguration().getList("xml[@fileName]"); + CompositeConfiguration finalConfig = new CompositeConfiguration(firewallConfiguration.getConfiguration()); + List subFiles = firewallConfiguration.getConfiguration().getList("xml[@fileName]"); for (Object subFile : subFiles) { finalConfig.addConfiguration(new XMLConfiguration((String) subFile)); diff --git a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java b/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java index 431da470e0..ab340ab849 100644 --- a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java +++ b/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java @@ -119,9 +119,8 @@ public class FirewallPluginTest extends InternalBrokerBaseCase // Configure plugin FirewallConfiguration config = new FirewallConfiguration(); config.setConfiguration("", new XMLConfiguration(confFile)); - Firewall plugin = new Firewall(config); - plugin._config = config; - plugin.configure(); + Firewall plugin = new Firewall(); + plugin.configure(config); return plugin; } |