diff options
| author | Robert Godfrey <rgodfrey@apache.org = rgodfrey = Robert Godfrey rgodfrey@apache.org@apache.org> | 2014-04-12 23:36:11 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org = rgodfrey = Robert Godfrey rgodfrey@apache.org@apache.org> | 2014-04-12 23:36:11 +0000 |
| commit | 3490d98ad80b047819ac5e83e17f8dd2c5ef3b3c (patch) | |
| tree | 952bc4d5f186642f545e0fa68e211134c2005d1e /qpid/java/broker-plugins | |
| parent | b36245c177e3de1aaabecd0d0a6fd94b2b4996fb (diff) | |
| download | qpid-python-3490d98ad80b047819ac5e83e17f8dd2c5ef3b3c.tar.gz | |
QPID-5686 : [Java Broker] Make handling of parents of ConfiguredObjects consistent; perform some refactoring of AbstractConfiguredObject to move functionality into helper classes
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586910 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
3 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java index 382f8d8efd..55de9fc902 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java @@ -53,7 +53,7 @@ public class ACLFileAccessControlProvider public ACLFileAccessControlProvider(Broker broker, Map<String, Object> attributes) { - super(Collections.<Class<? extends ConfiguredObject>,ConfiguredObject<?>>singletonMap(Broker.class, broker), + super(parentsMap(broker), attributes, broker.getTaskExecutor()); diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java index 4c272e929f..031febbb1a 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java @@ -438,7 +438,7 @@ public class Connection_1_0 implements ConnectionEventListener, AMQConnectionMod return _subject; } - VirtualHostImpl getVirtualHost() + public VirtualHostImpl getVirtualHost() { return _vhost; } diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java index 2cb611d382..fbdb34fb96 100644 --- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java +++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java @@ -19,6 +19,7 @@ package org.apache.qpid.server.management.plugin; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.util.HashMap; import java.util.Map; @@ -44,6 +45,7 @@ public class HttpManagementFactoryTest extends QpidTestCase _attributes.put(ConfiguredObject.TYPE, HttpManagement.PLUGIN_TYPE); _attributes.put(HttpManagement.TIME_OUT, SESSION_TIMEOUT); _attributes.put(ConfiguredObject.ID, _id); + when(_broker.getCategoryClass()).thenReturn(Broker.class); HttpManagement management = _pluginFactory.createInstance(_attributes, _broker); management.open(); |