svn commit: r701326 - in /incubator/qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java

[ritchiem]

Author: ritchiem
Date: Fri Oct  3 02:18:46 2008
New Revision: 701326

URL: http://svn.apache.org/viewvc?rev=701326&view=rev
Log:
QPID-1266 : Updates based on review

Modified:
    
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
    
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java

Modified: 
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=701326&r1=701325&r2=701326&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
 Fri Oct  3 02:18:46 2008
@@ -1115,13 +1115,6 @@
         {
             
ReferenceCountingExecutorService.getInstance().releaseExecutorService();
         }
-        else
-        {
-            if(_logger.isDebugEnabled())
-            {
-                _logger.debug("Queue " + getName() + " already stopped");
-            }
-        }
     }
 
     public void deliverAsync()

Modified: 
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java?rev=701326&r1=701325&r2=701326&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
 Fri Oct  3 02:18:46 2008
@@ -26,14 +26,14 @@
 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 @@
             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);
+        }       
     }
 }