Author: ritchiem
Date: Mon Apr 13 13:16:13 2009
New Revision: 764439
URL: http://svn.apache.org/viewvc?rev=764439&view=rev
Log:
QPID-1668: check initial count, don't assume it's 0. It should be, but there
are bugs in ApplicationRegistry.close that prevent this from working.
merged from trunk r747783
Modified:
qpid/branches/0.5-fix/qpid/ (props changed)
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
Propchange: qpid/branches/0.5-fix/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 13:16:13 2009
@@ -1 +1 @@
-/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376
+/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783
Modified:
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java?rev=764439&r1=764438&r2=764439&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
Mon Apr 13 13:16:13 2009
@@ -35,7 +35,7 @@
public void test() throws AMQException
{
- assertEquals("References exist before start!", 0,
ReferenceCountingExecutorService.getInstance().getReferenceCount());
+ int initialCount =
ReferenceCountingExecutorService.getInstance().getReferenceCount();
VirtualHost test =
ApplicationRegistry.getInstance(1).getVirtualHostRegistry().getVirtualHost("test");
try
@@ -45,12 +45,12 @@
false, test, null);
assertFalse("Creation did not start Pool.",
ReferenceCountingExecutorService.getInstance().getPool().isShutdown());
+
+ assertEquals("References not increased", initialCount + 1,
ReferenceCountingExecutorService.getInstance().getReferenceCount());
queue.stop();
- assertEquals("References still exist", 0,
ReferenceCountingExecutorService.getInstance().getReferenceCount());
-
- assertTrue("Stop did not clean up.",
ReferenceCountingExecutorService.getInstance().getPool().isShutdown());
+ assertEquals("References not decreased", initialCount ,
ReferenceCountingExecutorService.getInstance().getReferenceCount());
}
finally
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
