QPID-5611 : [Java Broker] remove LogActors

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1575315 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 22 insertions, 3 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
index cec339c033..047151684f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
@@ -81,7 +81,9 @@ public class ChannelLoggingTest extends AbstractTestLogging
         String log = getLogMessage(results, 0);
         //  MESSAGE [con:0(guest@anonymous(3273383)/test)/ch:1] CHN-1001 : Create
         validateMessageID("CHN-1001", log);
-        assertEquals("Incorrect Channel in actor:"+fromActor(log), isBroker010()? 0 : 1, getChannelID(fromActor(log)));
+        final String fromActor = fromActor(log);
+        final int channelID = getChannelID(fromActor);
+        assertEquals("Incorrect Channel in actor:"+fromActor(log), isBroker010()? 0 : 1, channelID);
 
         if (!isBroker010())
         {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
index 25dd5fd2f8..824a84eda8 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
@@ -69,7 +69,7 @@ public class VirtualHostLoggingTest extends AbstractTestLogging
         {
             List<String> vhosts = Arrays.asList("test");
 
-            assertEquals("Each vhost did not create a store.", vhosts.size(), results.size());
+            assertEquals("Each vhost did not create a store.", 2*vhosts.size(), results.size());
 
             for (int index = 0; index < results.size(); index++)
             {
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 8bad73d0ea..c2713a5e1f 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
@@ -20,11 +20,15 @@
  */
 package org.apache.qpid.test.utils;
 
+import java.security.PrivilegedAction;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.server.Broker;
+import org.apache.qpid.server.security.auth.TaskPrincipal;
+
+import javax.security.auth.Subject;
 
 public class InternalBrokerHolder implements BrokerHolder
 {
@@ -57,8 +61,21 @@ public class InternalBrokerHolder implements BrokerHolder
     {
         LOGGER.info("Shutting down Broker instance");
 
-        _broker.shutdown();
+        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<Object>()
+        {
+            @Override
+            public Object run()
+            {
+                _broker.shutdown();
+                return null;
+            }
+
 
+        });
         waitUntilPortsAreFree();
 
         LOGGER.info("Broker instance shutdown");