diff options
author | Alex Rudyy <orudyy@apache.org> | 2015-03-10 08:03:38 +0000 |
---|---|---|
committer | Alex Rudyy <orudyy@apache.org> | 2015-03-10 08:03:38 +0000 |
commit | 84d997ffc8c4c94dab6797e6d2b477d15f9e5c86 (patch) | |
tree | 8486f8c51bc35781c8db1af5339f486b16e4c8b2 /qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java | |
parent | 5cdfd4cb313381431ab66376758b10c662f5b374 (diff) | |
download | qpid-python-84d997ffc8c4c94dab6797e6d2b477d15f9e5c86.tar.gz |
QPID-6436: [Java Broker] Move ACL functionality scattered over the configured objects into SecurityManager and AbstractConfiguredObjects
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1665410 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java')
-rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java index 7cf988961e..95bd54424f 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java @@ -21,7 +21,6 @@ package org.apache.qpid.server.virtualhost; import java.io.File; -import java.security.AccessControlException; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Collection; @@ -74,7 +73,6 @@ import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.QueueConsumer; import org.apache.qpid.server.queue.QueueEntry; import org.apache.qpid.server.security.SecurityManager; -import org.apache.qpid.server.security.access.Operation; import org.apache.qpid.server.stats.StatisticsCounter; import org.apache.qpid.server.store.ConfiguredObjectRecord; import org.apache.qpid.server.store.DurableConfigurationStore; @@ -421,25 +419,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte return _connectionRegistry; } - @Override - protected void authoriseSetDesiredState(State desiredState) throws AccessControlException - { - if(desiredState == State.DELETED) - { - _broker.getSecurityManager().authoriseVirtualHost(getName(), Operation.DELETE); - } - else - { - _broker.getSecurityManager().authoriseVirtualHost(getName(), Operation.UPDATE); - } - } - - @Override - protected void authoriseSetAttributes(ConfiguredObject<?> modified, Set<String> attributes) throws AccessControlException - { - _broker.getSecurityManager().authoriseVirtualHost(getName(), Operation.UPDATE); - } - public Collection<Connection> getConnections() { return getChildren(Connection.class); @@ -665,11 +644,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte public AMQQueue<?> createQueue(Map<String, Object> attributes) throws QueueExistsException { - checkVHostStateIsActive(); - - AMQQueue<?> queue = addQueue(attributes); - childAdded(queue); - return queue; + return (AMQQueue<?> )createChild(Queue.class, attributes); } private AMQQueue<?> addQueue(Map<String, Object> attributes) throws QueueExistsException @@ -753,10 +728,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte throws ExchangeExistsException, ReservedExchangeNameException, NoFactoryForTypeException { - checkVHostStateIsActive(); - ExchangeImpl child = addExchange(attributes); - childAdded(child); - return child; + return (ExchangeImpl)createChild(Exchange.class, attributes); } |