From c7ed759b025963ad2645b4da7e5b90d104a35948 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sat, 8 Mar 2014 10:28:33 +0000 Subject: QPID-5611 : Ensure the appropriate principals are available at the time of all event logging git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1575506 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'qpid/java/systests/src') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java index c2713a5e1f..f980453d49 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java @@ -27,6 +27,7 @@ import org.apache.log4j.Logger; import org.apache.qpid.server.Broker; import org.apache.qpid.server.security.auth.TaskPrincipal; +import org.apache.qpid.server.security.SecurityManager; import javax.security.auth.Subject; @@ -61,11 +62,7 @@ public class InternalBrokerHolder implements BrokerHolder { LOGGER.info("Shutting down Broker instance"); - Subject subject = org.apache.qpid.server.security.SecurityManager.SYSTEM; - subject = new Subject(false, subject.getPrincipals(), subject.getPublicCredentials(), subject.getPrivateCredentials()); - subject.getPrincipals().add(new TaskPrincipal("Shutdown")); - - Subject.doAs(subject, new PrivilegedAction() + Subject.doAs(SecurityManager.getSystemTaskSubject("Shutdown"), new PrivilegedAction() { @Override public Object run() -- cgit v1.2.1