QPID-3048: InternalBrokerBasecase not removing all log actors

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

2 files changed, 13 insertions, 12 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java b/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
index 3d31a705fe..2ebbfeb734 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
@@ -21,9 +21,6 @@
 package org.apache.qpid.server.logging.actors;
 
 import org.apache.qpid.server.logging.LogActor;
-import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.RootMessageLogger;
 
 import java.util.EmptyStackException;
 import java.util.Stack;
@@ -72,7 +69,7 @@ public class CurrentActor
     private static LogActor _defaultActor;
 
     /**
-     * Set a new LogActor to be the Current Actor
+     * Set a new {@link LogActor} to be the Current Actor
      * <p/>
      * This pushes the Actor in to the LIFO Queue
      *
@@ -85,7 +82,16 @@ public class CurrentActor
     }
 
     /**
-     * Remove the current LogActor.
+     * Remove all {@link LogActor}s
+     */
+    public static void removeAll()
+    {
+        Stack<LogActor> stack = _currentActor.get();
+        stack.clear();
+    }
+
+    /**
+     * Remove the current {@link LogActor}.
      * <p/>
      * Calling remove without calling set will result in an EmptyStackException.
      */
@@ -96,9 +102,7 @@ public class CurrentActor
     }
 
     /**
-     * Return the current head of the list of LogActors.
-     * <p/>
-     * If there has been no set call then this will return Null.
+     * Return the current head of the list of {@link LogActor}s.
      *
      * @return Current LogActor
      */
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index 595822173f..925b161118 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
@@ -149,10 +149,7 @@ public class InternalBrokerBaseCase extends QpidTestCase
         {
             super.tearDown();
             // Purge Any erroneously added actors
-            while (CurrentActor.get() != null)
-            {
-                CurrentActor.remove();
-            }
+            CurrentActor.removeAll();
         }
     }