summaryrefslogtreecommitdiff
path: root/java/broker
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2013-04-29 15:39:20 +0000
committerRobert Gemmell <robbie@apache.org>2013-04-29 15:39:20 +0000
commitc5e7ad88fdb11e8c80d67989417a049e88142985 (patch)
treee9880cbf5014fae7c3152911ff0030319d722208 /java/broker
parentd7423a45e1c98d313d742b99276e31d898397a73 (diff)
downloadqpid-python-c5e7ad88fdb11e8c80d67989417a049e88142985.tar.gz
QPID-4753: set vhost SecurityManager _managementMode boolean to equal the parent/broker SecurityManager, validate the ACL file during onCreate to ensure it is usable before allowing it to be added
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1477155 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
-rwxr-xr-xjava/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
index 375b731d85..f0570943cf 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
+++ b/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);