diff options
| author | Ted Ross <tross@apache.org> | 2010-01-05 20:22:19 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2010-01-05 20:22:19 +0000 |
| commit | d26a5dd79de0434d8145803f1fe40b572be18aa1 (patch) | |
| tree | 5139a53f3e0d16cf936c7ee6e994fbc2733496f1 | |
| parent | 25d63a161d11d504e51ead2f76e761f561503b69 (diff) | |
| download | qpid-python-d26a5dd79de0434d8145803f1fe40b572be18aa1.tar.gz | |
QPID-2318
Reverted the original fix, which was not needed, and added code (from Rafi) to provide
the session-level acknowledgements.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@896198 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/python/qmf/console.py | 2 | ||||
| -rw-r--r-- | qpid/python/qpid/management.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qpid/python/qmf/console.py b/qpid/python/qmf/console.py index 5348904097..6f200d0f3f 100644 --- a/qpid/python/qmf/console.py +++ b/qpid/python/qmf/console.py @@ -1810,6 +1810,8 @@ class Broker: elif opcode == 'c': self.session._handleContentInd (self, codec, seq, prop=True) elif opcode == 'i': self.session._handleContentInd (self, codec, seq, stat=True) elif opcode == 'g': self.session._handleContentInd (self, codec, seq, prop=True, stat=True) + self.session.receiver._completed.add(msg.id) + self.session.channel.session_completed(self.session.receiver._completed) def _exceptionCb(self, data): self.connected = False diff --git a/qpid/python/qpid/management.py b/qpid/python/qpid/management.py index 5ba936aa0b..a23932aebb 100644 --- a/qpid/python/qpid/management.py +++ b/qpid/python/qpid/management.py @@ -196,13 +196,15 @@ class managementChannel: """ Receive messages via the topic queue on this channel. """ if self.enabled: self.tcb (self, msg) - self.ssn.message_accept(RangedSet(msg.id)) + self.ssn.receiver._completed.add(msg.id) + self.ssn.channel.session_completed(self.ssn.receiver._completed) def replyCb (self, msg): """ Receive messages via the reply queue on this channel. """ if self.enabled: self.rcb (self, msg) - self.ssn.message_accept(RangedSet(msg.id)) + self.ssn.receiver._completed.add(msg.id) + self.ssn.channel.session_completed(self.ssn.receiver._completed) def exceptionCb (self, data): if self.ecb != None: |