summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/firewall/src
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/broker-plugins/firewall/src')
-rw-r--r--qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java7
1 files changed, 4 insertions, 3 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 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.");
}
}