diff options
Diffstat (limited to 'qpid/java')
2 files changed, 6 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java index 451b1f9c40..6beeef2f18 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java @@ -91,13 +91,16 @@ public class DefaultAccessControl implements AccessControl @Override public void onCreate() { - //verify file exists if(_aclFile != null) { + //verify it exists if (!_aclFile.exists()) { throw new IllegalConfigurationException("ACL file '" + _aclFile + "' is not found"); } + + //verify it is parsable + new PlainConfiguration(_aclFile).load(); } } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java index 375b731d85..f0570943cf 100755 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java @@ -137,6 +137,8 @@ public class SecurityManager implements ConfigurationChangeListener */ public SecurityManager(SecurityManager parent, String aclFile, String vhostName) { + _managementMode = parent._managementMode; + if(!_managementMode) { configureVirtualHostAclPlugin(aclFile, vhostName); |