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 2015/11/06 21:44:40 UTC

[1/2] qpid-proton git commit: PROTON-1000: break circularites via receiver handler

Repository: qpid-proton
Updated Branches:
  refs/heads/master 07dc168b5 -> a8c947399


PROTON-1000: break circularites via receiver handler


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/9cf3ab8e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/9cf3ab8e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/9cf3ab8e

Branch: refs/heads/master
Commit: 9cf3ab8ee0096d60629c6cec440421c1a4892cb0
Parents: 07dc168
Author: Gordon Sim <gs...@redhat.com>
Authored: Fri Nov 6 18:15:30 2015 +0000
Committer: Gordon Sim <gs...@redhat.com>
Committed: Fri Nov 6 18:15:30 2015 +0000

----------------------------------------------------------------------
 proton-c/bindings/python/proton/utils.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9cf3ab8e/proton-c/bindings/python/proton/utils.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/utils.py b/proton-c/bindings/python/proton/utils.py
index bc44adf..5094285 100644
--- a/proton-c/bindings/python/proton/utils.py
+++ b/proton-c/bindings/python/proton/utils.py
@@ -131,6 +131,10 @@ class BlockingReceiver(BlockingLink):
         if credit: receiver.flow(credit)
         self.fetcher = fetcher
 
+    def __del__(self):
+        self.fetcher = None
+        self.link.handler = None
+
     def receive(self, timeout=False):
         if not self.fetcher:
             raise Exception("Can't call receive on this receiver as a handler was provided")
@@ -217,8 +221,12 @@ class BlockingConnection(Handler):
 
     def close(self):
         self.conn.close()
-        self.wait(lambda: not (self.conn.state & Endpoint.REMOTE_ACTIVE),
-                  msg="Closing connection")
+        try:
+            self.wait(lambda: not (self.conn.state & Endpoint.REMOTE_ACTIVE),
+                      msg="Closing connection")
+        finally:
+            self.conn = None
+            self.container = None
 
     def _is_closed(self):
         return self.conn.state & (Endpoint.LOCAL_CLOSED | Endpoint.REMOTE_CLOSED)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[2/2] qpid-proton git commit: PROTON-1005: remove references to ANONYMOUS-RELAY

Posted by gs...@apache.org.
PROTON-1005: remove references to ANONYMOUS-RELAY


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a8c94739
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a8c94739
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a8c94739

Branch: refs/heads/master
Commit: a8c94739922524fde4891d59114ea3919cfd96ba
Parents: 9cf3ab8
Author: Gordon Sim <gs...@redhat.com>
Authored: Fri Nov 6 20:22:23 2015 +0000
Committer: Gordon Sim <gs...@redhat.com>
Committed: Fri Nov 6 20:22:23 2015 +0000

----------------------------------------------------------------------
 examples/python/proton_server.py | 17 +++--------------
 examples/python/server.py        | 13 ++-----------
 2 files changed, 5 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8c94739/examples/python/proton_server.py
----------------------------------------------------------------------
diff --git a/examples/python/proton_server.py b/examples/python/proton_server.py
index c2520c1..9351f55 100755
--- a/examples/python/proton_server.py
+++ b/examples/python/proton_server.py
@@ -28,16 +28,11 @@ class Server(MessagingHandler):
         self.container = Container(self)
         self.conn = self.container.connect(host)
         self.receiver = self.container.create_receiver(self.conn, address)
-        self.senders = {}
-        self.relay = None
+        self.sender = self.container.create_sender(self.conn, None)
 
     def on_message(self, event):
         self.on_request(event.message.body, event.message.reply_to)
 
-    def on_connection_open(self, event):
-        if event.connection.remote_offered_capabilities and "ANONYMOUS-RELAY" in event.connection.remote_offered_capabilities:
-            self.relay = self.container.create_sender(self.conn, None)
-
     def on_connection_close(self, endpoint, error):
         if error: print("Closed due to %s" % error)
         self.conn.close()
@@ -46,16 +41,10 @@ class Server(MessagingHandler):
         self.container.run()
 
     def send(self, response, reply_to):
-        sender = self.relay
-        if not sender:
-            sender = self.senders.get(reply_to)
-        if not sender:
-            sender = self.container.create_sender(self.conn, reply_to)
-            self.senders[reply_to] = sender
         msg = Message(body=response)
-        if self.relay:
+        if self.sender:
             msg.address = reply_to
-        sender.send_msg(msg)
+        self.sender.send(msg)
 
     def on_request(self, request, reply_to):
         pass

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8c94739/examples/python/server.py
----------------------------------------------------------------------
diff --git a/examples/python/server.py b/examples/python/server.py
index 3b0a085..8cebaad 100755
--- a/examples/python/server.py
+++ b/examples/python/server.py
@@ -28,26 +28,17 @@ class Server(MessagingHandler):
         super(Server, self).__init__()
         self.url = url
         self.address = address
-        self.senders = {}
 
     def on_start(self, event):
         print("Listening on", self.url)
         self.container = event.container
         self.conn = event.container.connect(self.url)
         self.receiver = event.container.create_receiver(self.conn, self.address)
-        self.relay = None
-
-    def on_connection_opened(self, event):
-        if event.connection.remote_offered_capabilities and 'ANONYMOUS-RELAY' in event.connection.remote_offered_capabilities:
-            self.relay = self.container.create_sender(self.conn, None)
+        self.server = self.container.create_sender(self.conn, None)
 
     def on_message(self, event):
         print("Received", event.message)
-        sender = self.relay or self.senders.get(event.message.reply_to)
-        if not sender:
-            sender = self.container.create_sender(self.conn, event.message.reply_to)
-            self.senders[event.message.reply_to] = sender
-        sender.send(Message(address=event.message.reply_to, body=event.message.body.upper(),
+        self.server.send(Message(address=event.message.reply_to, body=event.message.body.upper(),
                             correlation_id=event.message.correlation_id))
 
 try:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org