From ee4a5e6b660562bd1f83d85d0b9ecefc88d434c5 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Thu, 3 Jun 2010 21:29:34 +0000 Subject: Cleanup code. Configuration security.access is not used anymore git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@951167 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/security/access/plugins/FirewallConfiguration.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'qpid/java/broker-plugins/firewall/src') 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 1a2bf62d73..b10656d622 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 @@ -91,10 +91,11 @@ public class FirewallConfiguration extends ConfigurationPlugin _finalConfig.addConfiguration(new XMLConfiguration((String) subFile)); } - // all rules must have an access attribute - if (_finalConfig.getList("rule[@access]").size() == 0) + // all rules must have an access attribute or a default value + if (_finalConfig.getList("rule[@access]").size() == 0 && + _configuration.getString("[@default-action]") == null) { - throw new ConfigurationException("No rules found in firewall configuration."); + throw new ConfigurationException("No rules or default-action found in firewall configuration."); } } -- cgit v1.2.1