summaryrefslogtreecommitdiff
path: root/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2015-03-12 15:13:16 +0000
committerKeith Wall <kwall@apache.org>2015-03-12 15:13:16 +0000
commit49c02f9fcf8c2dd1b063c887f8948f840ec785c2 (patch)
tree7fa009399d501d9ad3e9f77f735d85a2b75807cf /qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java
parentd31279a6374f4fd4326d04fdae456543547d441f (diff)
parentb66b4f357a756449c7e7184be4d963fb36f5b2d4 (diff)
downloadqpid-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/lifecycle/TestConfiguredObject.java')
-rw-r--r--qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java
index d4223a2b38..aa4e6112d0 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java
@@ -41,6 +41,7 @@ import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
+import org.apache.qpid.server.model.testmodels.TestSecurityManager;
import org.apache.qpid.server.plugin.ConfiguredObjectRegistration;
import org.apache.qpid.server.security.SecurityManager;
@@ -81,7 +82,7 @@ public class TestConfiguredObject extends AbstractConfiguredObject
{
super(parents, attributes, taskExecutor, model);
_opened = false;
- _securityManager = new SecurityManager(this, false);
+ _securityManager = new TestSecurityManager(this);
}
@Override