Merged revisions 507491-507559,507561-507601,507603-507621,507623-507671,507673-507959,507961-507992,507994-508097,508099-508149,508151-508155,508157-508232,508234-508378,508380-508390,508392-508459,508461-508704,508707-509615,509617-509737,509739-509753,509756-509833,509835-510106,510108-510160,510162-510179,510181-510552,510554-510704,510706-510911,510913-510985,510987-511003,511005-514750,514752-515720,515722-516156,516158-516458,516461-516484,516486-516488,516490-517823,517825,517827,517829,517831-517832,517834-517848,517850,517852-517854,517856-517858,517860-517877,517879-517886,517888-517891,517893-517903,517905,517907-517928,517930,517932-518197,518201-518206,518208-518230,518232,518235,518237,518239-518240,518243-518245,518247-518255,518257,518259-518260,518262,518264,518266-518292,518294-518707 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9

........
  r507491 | gsim | 2007-02-14 06:39:26 -0500 (Wed, 14 Feb 2007) | 3 lines
  
  Expanded the use of batched acks to a few other places in tests.
........
  r508377 | gsim | 2007-02-16 07:03:37 -0500 (Fri, 16 Feb 2007) | 4 lines
  
  Updated failing list for java (some of these result in test suite blocking)
  Added better error handling when connection closes without close method
........
  r508396 | gsim | 2007-02-16 08:54:54 -0500 (Fri, 16 Feb 2007) | 3 lines
  
  Fix: use message_resume not channel_resume
........
  r509611 | gsim | 2007-02-20 10:39:14 -0500 (Tue, 20 Feb 2007) | 3 lines
  
  Fixed bug where response id rather than request id was being used to get listener for response.
........
  r509617 | gsim | 2007-02-20 10:52:31 -0500 (Tue, 20 Feb 2007) | 3 lines
  
  Updated list of failing tests for java broker on this branch.
........
  r510096 | gsim | 2007-02-21 11:49:27 -0500 (Wed, 21 Feb 2007) | 5 lines
  
  Fixed bug in references where map wasn't qualified in close
  Attach reference to transfer, as it will be deleted on close
  Altered tests to get reference from the message on the queue rather than looking them up from channel as they are already gone there
........
  r510114 | astitcher | 2007-02-21 12:37:36 -0500 (Wed, 21 Feb 2007) | 3 lines
  
   r1224@fuschia:  andrew | 2007-02-21 17:20:59 +0000
   Updated expected cpp broker test failures
........
  r510128 | gsim | 2007-02-21 13:06:02 -0500 (Wed, 21 Feb 2007) | 3 lines
  
  Ensure socket is closed in tearDown
........
  r510913 | gsim | 2007-02-23 06:37:08 -0500 (Fri, 23 Feb 2007) | 3 lines
  
  Revised list of failing tests for java broker on this branch
........
  r515363 | aconway | 2007-03-06 18:35:08 -0500 (Tue, 06 Mar 2007) | 6 lines
  
  * python/qpid/peer.py (Channel.__init__): use reliable framing if
    version >= 0-8.
  * python/qpid/spec.py (Spec.__init__): Remove unused parameter.
  * python/qpid/testlib.py (TestRunner._parseargs): Add --errata option,
    set default errata only if --spec is not present.
........
  r518707 | aconway | 2007-03-15 13:49:44 -0400 (Thu, 15 Mar 2007) | 6 lines
  
  
  * python/qpid/peer.py (Peer.close): Close delegate *before* channels.
    Otherwise we get a race: closing a channel can wake a client thread,
    which may see client.closed as still false. Was causing bogus exceptions
    in some tests.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@520094 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 4 deletions

diff --git a/python/qpid/peer.py b/python/qpid/peer.py
index 6c8c6647c9..28db20f187 100644
--- a/python/qpid/peer.py
+++ b/python/qpid/peer.py
@@ -97,9 +97,12 @@ class Peer:
       self.fatal()
 
   def close(self, reason):
+    # We must close the delegate first because closing channels
+    # may wake up waiting threads and we don't want them to see
+    # the delegate as open.
+    self.delegate.close(reason)
     for ch in self.channels.values():
       ch.close(reason)
-    self.delegate.close(reason)
 
   def writer(self):
     try:
@@ -144,7 +147,7 @@ class Requester:
     self.write(frame, content)
 
   def receive(self, channel, frame):
-    listener = self.outstanding.pop(frame.id)
+    listener = self.outstanding.pop(frame.request_id)
     listener(channel, frame)
 
 class Responder:
@@ -178,8 +181,8 @@ class Channel:
     self.requester = Requester(self.write)
     self.responder = Responder(self.write)
 
-    # XXX: better switch
-    self.reliable = False
+    # Use reliable framing if version == 0-9.
+    self.reliable = (spec.major == 0 and spec.minor == 9)
     self.synchronous = True
 
   def close(self, reason):