Author: rupertlssmith Date: Mon Sep 24 04:25:46 2007 New Revision: 578765 URL: http://svn.apache.org/viewvc?rev=578765&view=rev Log: Blocked revisions 578733,578735,578745 via svnmerge
................ r578733 | rupertlssmith | 2007-09-24 10:47:30 +0100 (Mon, 24 Sep 2007) | 1 line Removed change tracking, to re-init. ................ r578735 | rupertlssmith | 2007-09-24 10:54:24 +0100 (Mon, 24 Sep 2007) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-568187,574873,574876,575253,575688,576861,577193,577316,577660,578048,578061" from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ................ r578745 | rupertlssmith | 2007-09-24 11:22:32 +0100 (Mon, 24 Sep 2007) | 30 lines 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. ........ ................ Modified: incubator/qpid/branches/M2/ (props changed) Propchange: incubator/qpid/branches/M2/ ------------------------------------------------------------------------------ svnmerge-blocked = /incubator/qpid/branches/M2.1:578733,578735,578745
