2 files changed, 5 insertions, 16 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index 6631bc3559..9b196e4e3d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -1115,13 +1115,6 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
         {
             ReferenceCountingExecutorService.getInstance().releaseExecutorService();
         }
-        else
-        {
-            if(_logger.isDebugEnabled())
-            {
-                _logger.debug("Queue " + getName() + " already stopped");
-            }
-        }
     }
 
     public void deliverAsync()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
index 106ed8c941..f76c652793 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
@@ -26,14 +26,14 @@ import org.apache.qpid.pool.ReferenceCountingExecutorService;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
 import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.AMQException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SimpleAMQQueueThreadPoolTest extends TestCase
 {
-    private static final Logger _logger = LoggerFactory.getLogger(VirtualHost.class);
 
-    public void test()
+    public void test() throws AMQException
     {
         VirtualHost test = ApplicationRegistry.getInstance(1).getVirtualHostRegistry().getVirtualHost("test");
 
@@ -50,14 +50,10 @@ public class SimpleAMQQueueThreadPoolTest extends TestCase
             assertEquals("References still exist", 0, ReferenceCountingExecutorService.getInstance().getReferenceCount());
 
             assertTrue("Stop did not clean up.", ReferenceCountingExecutorService.getInstance().getPool().isShutdown());
-
         }
-        catch (Exception e)
+        finally
         {
-            e.printStackTrace();
-            fail(e.getCause() == null ? e.getMessage() : e.getCause().getMessage());
-        }
-       
-        ApplicationRegistry.remove(1);
+            ApplicationRegistry.remove(1);
+        }       
     }
 }