diff options
author | Keith Wall <kwall@apache.org> | 2015-03-12 15:13:16 +0000 |
---|---|---|
committer | Keith Wall <kwall@apache.org> | 2015-03-12 15:13:16 +0000 |
commit | 49c02f9fcf8c2dd1b063c887f8948f840ec785c2 (patch) | |
tree | 7fa009399d501d9ad3e9f77f735d85a2b75807cf /qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java | |
parent | d31279a6374f4fd4326d04fdae456543547d441f (diff) | |
parent | b66b4f357a756449c7e7184be4d963fb36f5b2d4 (diff) | |
download | qpid-python-49c02f9fcf8c2dd1b063c887f8948f840ec785c2.tar.gz |
Merge from trunkQPID-6262-JavaBrokerNIO
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666219 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java')
-rw-r--r-- | qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java index 5de40042cc..794c2cfee0 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java @@ -24,9 +24,11 @@ import java.util.Set; import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.model.AbstractConfiguredObject; +import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; +import org.apache.qpid.server.model.testmodels.TestSecurityManager; import org.apache.qpid.server.security.SecurityManager; @ManagedObject( category = false, type = TestSingletonImpl.TEST_SINGLETON_TYPE) @@ -73,7 +75,7 @@ public class TestSingletonImpl extends AbstractConfiguredObject<TestSingletonImp public TestSingletonImpl(final Map<String, Object> attributes) { super(parentsMap(), attributes, newTaskExecutor(), TestModel.getInstance()); - _securityManager = new SecurityManager(this, false); + _securityManager = new TestSecurityManager(this); } private static CurrentThreadTaskExecutor newTaskExecutor() @@ -87,7 +89,7 @@ public class TestSingletonImpl extends AbstractConfiguredObject<TestSingletonImp final TaskExecutor taskExecutor) { super(parentsMap(), attributes, taskExecutor); - _securityManager = new SecurityManager(this, false); + _securityManager = new TestSecurityManager(this); } |