diff options
author | Gordon Sim <gsim@apache.org> | 2007-09-21 10:39:36 +0000 |
---|---|---|
committer | Gordon Sim <gsim@apache.org> | 2007-09-21 10:39:36 +0000 |
commit | 03cd19556c261f43a8d95bd7d803c59bd488aeef (patch) | |
tree | c589afb8a7d83dc44c445fc44df7850d0bf01ae4 /python/qpid/peer.py | |
parent | 75d71dd695da1612d8ff6768a1a4b8082b2d2d65 (diff) | |
download | qpid-python-03cd19556c261f43a8d95bd7d803c59bd488aeef.tar.gz |
Use octet each for class and method id (changed c++ and python)
Modified indexes in xml for message.empty, message.offset and the c++ cluster class
Fixed encoding for rfc1982-long-set in c++ and python (its a size not a count that is prepended)
Fixed minor typo in configuration option help string
Use session.open/close in python tests, handle session.closed
Commented out the response tag in session.close due to pythons ambiguity as to whether session.closed is a response or not
Disabled broker.test_closed_channel (due to above issue); broker behaves as expected but test fails; test_invalid_channel is safe enough for now.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@578053 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qpid/peer.py')
-rw-r--r-- | python/qpid/peer.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python/qpid/peer.py b/python/qpid/peer.py index 5cabf98236..6e91c09806 100644 --- a/python/qpid/peer.py +++ b/python/qpid/peer.py @@ -261,7 +261,7 @@ class Channel: self.responder.respond(method, batch, request) def invoke(self, type, args, kwargs): - if type.klass.name == "channel" and (type.name == "close" or type.name == "open"): + if (type.klass.name in ["channel", "session"]) and (type.name in ["close", "open", "closed"]): self.completion.reset() self.incoming_completion.reset() self.completion.next_command(type) @@ -421,6 +421,7 @@ class OutgoingCompletion: self.condition.acquire() try: self.mark = mark + #print "set mark to %s [%s] " % (self.mark, self) self.condition.notifyAll() finally: self.condition.release() @@ -432,7 +433,7 @@ class OutgoingCompletion: self.condition.acquire() try: while not self.closed and point_of_interest > self.mark: - #print "waiting for ", point_of_interest, " mark is currently at ", self.mark + #print "waiting for %s, mark = %s [%s]" % (point_of_interest, self.mark, self) self.condition.wait(remaining) if not self.closed and point_of_interest > self.mark and timeout: if (start_time + timeout) < time(): break |