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/11/30 14:00:36 UTC
[1/2] qpid-proton git commit: PROTON-1703: [cpp] Remove auto_settle
from receiver_options
Repository: qpid-proton
Updated Branches:
refs/heads/master 584d3afc3 -> d5069e125
PROTON-1703: [cpp] Remove auto_settle from receiver_options
auto_settle is a sender-only option, the receiver equivalent is auto_accept
It is only used at messaging_adapter.cpp#L172, which applies only to senders.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d5069e12
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d5069e12
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d5069e12
Branch: refs/heads/master
Commit: d5069e1250b50ec3dc7205a9fa0cb1b33bb1b1c8
Parents: 0d399a2
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Nov 29 10:24:44 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Nov 30 08:59:54 2017 -0500
----------------------------------------------------------------------
proton-c/bindings/cpp/include/proton/receiver_options.hpp | 8 ++------
proton-c/bindings/cpp/src/receiver_options.cpp | 4 ----
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d5069e12/proton-c/bindings/cpp/include/proton/receiver_options.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/receiver_options.hpp b/proton-c/bindings/cpp/include/proton/receiver_options.hpp
index bcefb28..049fe86 100644
--- a/proton-c/bindings/cpp/include/proton/receiver_options.hpp
+++ b/proton-c/bindings/cpp/include/proton/receiver_options.hpp
@@ -38,7 +38,7 @@ namespace proton {
/// Options can be "chained" like this:
///
/// @code
-/// l = container.create_receiver(url, receiver_options().handler(h).auto_settle(true));
+/// l = container.create_receiver(url, receiver_options().handler(h).auto_accept(true));
/// @endcode
///
/// You can also create an options object with common settings and use
@@ -47,7 +47,7 @@ namespace proton {
///
/// @code
/// receiver_options opts;
-/// opts.auto_settle(true);
+/// opts.auto_accept(true);
/// c2 = container.open_receiver(url2, opts.handler(h2));
/// @endcode
///
@@ -83,10 +83,6 @@ class receiver_options {
/// default.
PN_CPP_EXTERN receiver_options& auto_accept(bool);
- /// Enable or disable automatic settlement of messages. It is
- /// enabled by default.
- PN_CPP_EXTERN receiver_options& auto_settle(bool);
-
/// Options for the source node of the receiver.
PN_CPP_EXTERN receiver_options& source(source_options&);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d5069e12/proton-c/bindings/cpp/src/receiver_options.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/receiver_options.cpp b/proton-c/bindings/cpp/src/receiver_options.cpp
index 1deb2ed..96e2ffa 100644
--- a/proton-c/bindings/cpp/src/receiver_options.cpp
+++ b/proton-c/bindings/cpp/src/receiver_options.cpp
@@ -65,7 +65,6 @@ class receiver_options::impl {
option<messaging_handler*> handler;
option<proton::delivery_mode> delivery_mode;
option<bool> auto_accept;
- option<bool> auto_settle;
option<int> credit_window;
option<bool> dynamic_address;
option<source_options> source;
@@ -77,7 +76,6 @@ class receiver_options::impl {
if (r.uninitialized()) {
if (delivery_mode.set) set_delivery_mode(r, delivery_mode.value);
if (handler.set && handler.value) container::impl::set_handler(r, handler.value);
- if (auto_settle.set) get_context(r).auto_settle = auto_settle.value;
if (auto_accept.set) get_context(r).auto_accept = auto_accept.value;
if (credit_window.set) get_context(r).credit_window = credit_window.value;
@@ -96,7 +94,6 @@ class receiver_options::impl {
handler.update(x.handler);
delivery_mode.update(x.delivery_mode);
auto_accept.update(x.auto_accept);
- auto_settle.update(x.auto_settle);
credit_window.update(x.credit_window);
dynamic_address.update(x.dynamic_address);
source.update(x.source);
@@ -121,7 +118,6 @@ void receiver_options::update(const receiver_options& x) { impl_->update(*x.impl
receiver_options& receiver_options::handler(class messaging_handler &h) { impl_->handler = &h; return *this; }
receiver_options& receiver_options::delivery_mode(proton::delivery_mode m) {impl_->delivery_mode = m; return *this; }
receiver_options& receiver_options::auto_accept(bool b) {impl_->auto_accept = b; return *this; }
-receiver_options& receiver_options::auto_settle(bool b) {impl_->auto_settle = b; return *this; }
receiver_options& receiver_options::credit_window(int w) {impl_->credit_window = w; return *this; }
receiver_options& receiver_options::source(source_options &s) {impl_->source = s; return *this; }
receiver_options& receiver_options::target(target_options &s) {impl_->target = s; return *this; }
---------------------------------------------------------------------
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-1636: [ruby] fix race condition
in ruby container tests
Posted by ac...@apache.org.
PROTON-1636: [ruby] fix race condition in ruby container tests
Made "stopped" a terminal state for the Container to avoid races during
shut-down, e.g. because threads have not even entered #run when the container
auto-stops.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/0d399a22
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/0d399a22
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/0d399a22
Branch: refs/heads/master
Commit: 0d399a229abd66e0bb3fa473e65f1681772cec2a
Parents: 584d3af
Author: Alan Conway <ac...@redhat.com>
Authored: Mon Nov 27 13:56:19 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Nov 30 08:59:54 2017 -0500
----------------------------------------------------------------------
proton-c/bindings/ruby/tests/old_examples/old_example_test.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/0d399a22/proton-c/bindings/ruby/tests/old_examples/old_example_test.rb
----------------------------------------------------------------------
diff --git a/proton-c/bindings/ruby/tests/old_examples/old_example_test.rb b/proton-c/bindings/ruby/tests/old_examples/old_example_test.rb
index 0ade719..de8077c 100755
--- a/proton-c/bindings/ruby/tests/old_examples/old_example_test.rb
+++ b/proton-c/bindings/ruby/tests/old_examples/old_example_test.rb
@@ -23,7 +23,7 @@ require 'qpid_proton'
require 'socket'
def unused_port; TCPServer.open(0) { |s| s.addr[1] } end
-def make_url(port, path) "amqp://:#{port}/${path}"; end # Make a proton pseudo-url
+def make_url(port, path) "amqp://:#{port}/#{path}"; end
class OldExampleTest < MiniTest::Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org