Author: tross
Date: Tue Jan 5 20:22:19 2010
New Revision: 896198
URL: http://svn.apache.org/viewvc?rev=896198&view=rev
Log:
QPID-2318
Reverted the original fix, which was not needed, and added code (from Rafi)
to provide
the session-level acknowledgements.
Modified:
qpid/trunk/qpid/python/qmf/console.py
qpid/trunk/qpid/python/qpid/management.py
Modified: qpid/trunk/qpid/python/qmf/console.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qmf/console.py?rev=896198&r1=896197&r2=896198&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qmf/console.py (original)
+++ qpid/trunk/qpid/python/qmf/console.py Tue Jan 5 20:22:19 2010
@@ -1810,6 +1810,8 @@
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
Modified: qpid/trunk/qpid/python/qpid/management.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/management.py?rev=896198&r1=896197&r2=896198&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/management.py (original)
+++ qpid/trunk/qpid/python/qpid/management.py Tue Jan 5 20:22:19 2010
@@ -196,13 +196,15 @@
""" 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:
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
