diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2015-03-13 23:38:32 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2015-03-13 23:38:32 +0000 |
| commit | 926e70ce9fdb4616cda00ec6f6fc3bbc0124d247 (patch) | |
| tree | 50ac95bdc90d98ad0f3b0696fc253b4ed67e8798 /qpid/java/broker-plugins | |
| parent | ea42a108d6a5ecfdca0da86084efab2065494b23 (diff) | |
| download | qpid-python-926e70ce9fdb4616cda00ec6f6fc3bbc0124d247.tar.gz | |
QPID-6450 : [Java Broker] Allow separate model configuration threads for each virtual host node
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666609 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
3 files changed, 5 insertions, 0 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java index 2a691b3652..c51ea64d9c 100644 --- a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java +++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java @@ -58,6 +58,8 @@ public class ACLFileAccessControlProviderFactoryTest extends QpidTestCase TaskExecutor taskExecutor = new CurrentThreadTaskExecutor(); taskExecutor.start(); when(_broker.getTaskExecutor()).thenReturn(taskExecutor); + when(_broker.getChildExecutor()).thenReturn(taskExecutor); + } public void testCreateInstanceWhenAclFileIsNotPresent() diff --git a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java index 82c209bb6f..abe8c6fd9f 100644 --- a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java +++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java @@ -52,6 +52,7 @@ public class ACLFileAccessControlProviderImplTest extends QpidTestCase _broker = mock(Broker.class); when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(_broker.getChildExecutor()).thenReturn(_taskExecutor); when(_broker.getModel()).thenReturn(_model); when(_broker.getId()).thenReturn(UUID.randomUUID()); } diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java index 4327292336..aa3ebe055d 100644 --- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java +++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java @@ -62,6 +62,8 @@ public class HttpManagementTest extends QpidTestCase TaskExecutor taskExecutor = new TaskExecutorImpl(); taskExecutor.start(); when(_broker.getTaskExecutor()).thenReturn(taskExecutor); + when(_broker.getChildExecutor()).thenReturn(taskExecutor); + Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, false); |