From 2af12a2b280c6ee0920f361ac39adb0855a5a9cb Mon Sep 17 00:00:00 2001 From: Rupert Smith Date: Mon, 24 Sep 2007 10:22:32 +0000 Subject: Merged revisions 575663-575687,575689-576860,576862-577192,577194-577315,577317-577659,577661-578047,578049-578060,578062-578604 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r575663 | rgodfrey | 2007-09-14 13:43:13 +0100 (Fri, 14 Sep 2007) | 1 line QPID-600 : Deadlock on connection.close ........ r577931 | rgreig | 2007-09-20 22:26:37 +0100 (Thu, 20 Sep 2007) | 1 line Adding timeouts to two wait() calls to prevent hanging ........ r578258 | rgreig | 2007-09-21 21:31:18 +0100 (Fri, 21 Sep 2007) | 1 line QPID-607: dispatcher threads now poll so that the can die when the connection is closed. ........ r578475 | rgreig | 2007-09-22 20:01:59 +0100 (Sat, 22 Sep 2007) | 1 line QPID-608 Fix the test by adding in creation of the VM broker ........ r578509 | rgreig | 2007-09-22 23:05:30 +0100 (Sat, 22 Sep 2007) | 1 line QPID-609 : dispatcher thread was being restarted by the code that closed the consumer due to the receipt of a basic.cancel frame. Move the dispatcher shutdown to the end of the consumer close process. Also rename the dispatcher _closed field since it clashes with a field in the container class. ........ r578604 | rgreig | 2007-09-23 22:29:33 +0100 (Sun, 23 Sep 2007) | 4 lines QPID-589: avoid the deadlock between the session close and the BasicCancelOkHandler by not sending a BasicCancel when the session is being closed. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@578745 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/test/unit/client/connection/ConnectionTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/client/src/test') diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java index 588c82221e..56394fee27 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java @@ -47,12 +47,12 @@ public class ConnectionTest extends TestCase protected void setUp() throws Exception { super.setUp(); -// TransportConnection.createVMBroker(1); + TransportConnection.createVMBroker(1); } protected void tearDown() throws Exception { -// TransportConnection.killVMBroker(1); + TransportConnection.killVMBroker(1); } public void testSimpleConnection() -- cgit v1.2.1