QPID-1812: Fix firewall rule parsing, add test for this.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@765250 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 2 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
index 85026121ab..810be8ae22 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
@@ -55,7 +55,7 @@ public class FirewallPlugin extends AbstractACLPlugin
         public ACLPlugin newInstance(Configuration config) throws ConfigurationException
         {
             FirewallPlugin plugin = new FirewallPlugin();
-            plugin.setConfiguration(config);
+            plugin.setConfiguration(config.subset("firewall"));
             return plugin;
         }
     };
@@ -245,7 +245,7 @@ public class FirewallPlugin extends AbstractACLPlugin
         }
         CompositeConfiguration finalConfig = new CompositeConfiguration(config);
         
-        List subFiles = config.getList("firewall.xml[@fileName]");
+        List subFiles = config.getList("xml[@fileName]");
         for (Object subFile : subFiles)
         {
             finalConfig.addConfiguration(new XMLConfiguration((String) subFile));