You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/10/13 13:54:13 UTC
[1/2] qpid-proton git commit: PROTON-1610: c++ intermittent self test
fails
Repository: qpid-proton
Updated Branches:
refs/heads/master bc6014057 -> 72b7ea050
PROTON-1610: c++ intermittent self test fails
C++ scheduler was not checking for (next->time < now), negative timeout interval
converted to large unsigned value when passed to pn_proactor_set_time-out.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/f76f2892
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/f76f2892
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/f76f2892
Branch: refs/heads/master
Commit: f76f28927e176b5b994d865a19e54f25d9708eb3
Parents: bc60140
Author: Alan Conway <ac...@redhat.com>
Authored: Fri Oct 13 14:39:42 2017 +0100
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Oct 13 14:42:05 2017 +0100
----------------------------------------------------------------------
proton-c/bindings/cpp/src/proactor_container_impl.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f76f2892/proton-c/bindings/cpp/src/proactor_container_impl.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/proactor_container_impl.cpp b/proton-c/bindings/cpp/src/proactor_container_impl.cpp
index 92feaaa..f59cb9b 100644
--- a/proton-c/bindings/cpp/src/proactor_container_impl.cpp
+++ b/proton-c/bindings/cpp/src/proactor_container_impl.cpp
@@ -406,7 +406,8 @@ void container::impl::schedule(duration delay, work f) {
// Set timeout for current head of timeout queue
scheduled* next = &deferred_.front();
- pn_proactor_set_timeout(proactor_, (next->time-now).milliseconds());
+ pn_millis_t timeout_ms = (now < next->time) ? (next->time-now).milliseconds() : 0;
+ pn_proactor_set_timeout(proactor_, timeout_ms);
}
void container::impl::client_connection_options(const connection_options &opts) {
---------------------------------------------------------------------
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-1592: [python] restore original
tx_recv.py example
Posted by ac...@apache.org.
PROTON-1592: [python] restore original tx_recv.py example
Previous commit introduced reproducer code into the example by mistake.
The original example works as-is.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/72b7ea05
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/72b7ea05
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/72b7ea05
Branch: refs/heads/master
Commit: 72b7ea0508e94aae3e5d9470293bc5c7e8250a45
Parents: f76f289
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Oct 12 10:45:51 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Oct 13 14:44:56 2017 +0100
----------------------------------------------------------------------
examples/python/tx_recv.py | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/72b7ea05/examples/python/tx_recv.py
----------------------------------------------------------------------
diff --git a/examples/python/tx_recv.py b/examples/python/tx_recv.py
index 7c0b7cc..4baddcf 100755
--- a/examples/python/tx_recv.py
+++ b/examples/python/tx_recv.py
@@ -40,12 +40,6 @@ class TxRecv(MessagingHandler, TransactionHandler):
self.container.declare_transaction(self.conn, handler=self)
self.transaction = None
- def on_link_opened(self, event):
- # NOTE: a transactional client opens an internal sender link for transaction commands,
- # which we want to ignore.
- if event.receiver:
- event.receiver.drain_mode = True
-
def on_message(self, event):
print(event.message.body)
self.transaction.accept(event.delivery)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org