You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/12/17 15:38:40 UTC
qpid-proton git commit: Updated after removal of the released
property on Delivery
Repository: qpid-proton
Updated Branches:
refs/heads/master 3f501ee8c -> 6302a89bc
Updated after removal of the released property on Delivery
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6302a89b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6302a89b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6302a89b
Branch: refs/heads/master
Commit: 6302a89bc82fdc6652ed2978ca5f559c25d2ead4
Parents: 3f501ee
Author: Gordon Sim <gs...@redhat.com>
Authored: Wed Dec 17 14:39:14 2014 +0000
Committer: Gordon Sim <gs...@redhat.com>
Committed: Wed Dec 17 14:39:14 2014 +0000
----------------------------------------------------------------------
proton-c/bindings/python/proton/handlers.py | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6302a89b/proton-c/bindings/python/proton/handlers.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/handlers.py b/proton-c/bindings/python/proton/handlers.py
index 4a6fd16..0181d0e 100644
--- a/proton-c/bindings/python/proton/handlers.py
+++ b/proton-c/bindings/python/proton/handlers.py
@@ -47,7 +47,7 @@ class FlowController(Handler):
self.top_up(event.link)
def on_delivery(self, event):
- if not event.delivery.released and event.delivery.link.is_receiver:
+ if event.delivery.link.is_receiver:
self.top_up(event.delivery.link)
def nested_handlers(handlers):
@@ -101,7 +101,6 @@ class OutgoingMessageHandler(Handler):
def on_delivery(self, event):
dlv = event.delivery
- if dlv.released: return
if dlv.link.is_sender and dlv.updated:
if dlv.remote_state == Delivery.ACCEPTED:
self.on_accepted(event)
@@ -182,7 +181,7 @@ class IncomingMessageHandler(Handler, Acking):
def on_delivery(self, event):
dlv = event.delivery
- if dlv.released or not dlv.link.is_receiver: return
+ if not dlv.link.is_receiver: return
if dlv.readable and not dlv.partial:
event.message = recv_msg(dlv)
try:
@@ -390,9 +389,6 @@ class MessagingHandler(Handler, Acking):
"""
def __init__(self, prefetch=10, auto_accept=True, auto_settle=True, peer_close_is_error=False):
self.handlers = []
- # FlowController if used needs to see event before
- # IncomingMessageHandler, as the latter may involve the
- # delivery being released
if prefetch:
self.handlers.append(FlowController(prefetch))
self.handlers.append(EndpointStateHandler(peer_close_is_error, self))
@@ -447,9 +443,6 @@ class TransactionalClientHandler(Handler, TransactionalAcking):
def __init__(self, prefetch=10, auto_accept=False, auto_settle=True, peer_close_is_error=False):
super(TransactionalClientHandler, self).__init__()
self.handlers = []
- # FlowController if used needs to see event before
- # IncomingMessageHandler, as the latter may involve the
- # delivery being released
if prefetch:
self.handlers.append(FlowController(prefetch))
self.handlers.append(EndpointStateHandler(peer_close_is_error, self))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org