You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2016/04/15 23:23:42 UTC

[1/3] qpid-proton git commit: PROTON-1179: [C++ binding] rename condition::info->properties

Repository: qpid-proton
Updated Branches:
  refs/heads/master c62d5d4ef -> 288b1a6f7


PROTON-1179: [C++ binding] rename condition::info->properties


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

Branch: refs/heads/master
Commit: e826d858858152f7a64dad8a5247f89c3f4942e1
Parents: c62d5d4
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Apr 15 16:34:57 2016 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Fri Apr 15 16:34:57 2016 -0400

----------------------------------------------------------------------
 proton-c/bindings/cpp/include/proton/condition.hpp | 2 +-
 proton-c/bindings/cpp/src/condition.cpp            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e826d858/proton-c/bindings/cpp/include/proton/condition.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/condition.hpp b/proton-c/bindings/cpp/include/proton/condition.hpp
index f6067a5..9a350f8 100644
--- a/proton-c/bindings/cpp/include/proton/condition.hpp
+++ b/proton-c/bindings/cpp/include/proton/condition.hpp
@@ -71,7 +71,7 @@ class condition {
     PN_CPP_EXTERN std::string description() const;
 
     /// Extra information for condition.
-    PN_CPP_EXTERN value info() const;
+    PN_CPP_EXTERN value properties() const;
 
     /// Simple printable string for condition.
     PN_CPP_EXTERN std::string what() const;

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e826d858/proton-c/bindings/cpp/src/condition.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/condition.cpp b/proton-c/bindings/cpp/src/condition.cpp
index b604251..391c12e 100644
--- a/proton-c/bindings/cpp/src/condition.cpp
+++ b/proton-c/bindings/cpp/src/condition.cpp
@@ -41,7 +41,7 @@ std::string condition::description() const {
     return d ? d : "";
 }
 
-value condition::info() const {
+value condition::properties() const {
     pn_data_t* t = pn_condition_info(condition_);
     return t ? value(t) : value();
 }


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


[2/3] qpid-proton git commit: PROTON-1153: [C++ binding] Change message member names: - address -> to (retaining address as an alias) - application_properties -> properties

Posted by as...@apache.org.
PROTON-1153: [C++ binding] Change message member names:
- address -> to (retaining address as an alias)
- application_properties -> properties


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

Branch: refs/heads/master
Commit: 9be087df797229fb025d6d9cdd96ca1051d15596
Parents: e826d85
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Apr 15 16:53:06 2016 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Fri Apr 15 16:53:06 2016 -0400

----------------------------------------------------------------------
 examples/cpp/engine/server.cpp                  |  2 +-
 examples/cpp/server.cpp                         |  2 +-
 examples/cpp/server_direct.cpp                  |  2 +-
 .../bindings/cpp/include/proton/message.hpp     |  8 ++++++--
 proton-c/bindings/cpp/src/message.cpp           | 17 +++++++++++++----
 proton-c/bindings/cpp/src/message_test.cpp      | 20 ++++++++++----------
 6 files changed, 32 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9be087df/examples/cpp/engine/server.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/engine/server.cpp b/examples/cpp/engine/server.cpp
index 336dbb3..31f3599 100644
--- a/examples/cpp/engine/server.cpp
+++ b/examples/cpp/engine/server.cpp
@@ -62,7 +62,7 @@ class server : public proton::handler {
         std::cout << "Received " << m.body() << std::endl;
         std::string reply_to = m.reply_to();
         proton::message reply;
-        reply.address(reply_to);
+        reply.to(reply_to);
         reply.body(to_upper(proton::get<std::string>(m.body())));
         reply.correlation_id(m.correlation_id());
         if (!senders[reply_to])

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9be087df/examples/cpp/server.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/server.cpp b/examples/cpp/server.cpp
index eb4cc7a..370c33b 100644
--- a/examples/cpp/server.cpp
+++ b/examples/cpp/server.cpp
@@ -66,7 +66,7 @@ class server : public proton::handler {
         std::string reply_to = m.reply_to();
         proton::message reply;
 
-        reply.address(reply_to);
+        reply.to(reply_to);
         reply.body(to_upper(proton::get<std::string>(m.body())));
         reply.correlation_id(m.correlation_id());
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9be087df/examples/cpp/server_direct.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/server_direct.cpp b/examples/cpp/server_direct.cpp
index 76b8625..a72d246 100644
--- a/examples/cpp/server_direct.cpp
+++ b/examples/cpp/server_direct.cpp
@@ -86,7 +86,7 @@ class server : public proton::handler {
             proton::sender sender = it->second;
             proton::message reply;
 
-            reply.address(reply_to);
+            reply.to(reply_to);
             reply.body(to_upper(proton::get<std::string>(m.body())));
             reply.correlation_id(m.correlation_id());
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9be087df/proton-c/bindings/cpp/include/proton/message.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/message.hpp b/proton-c/bindings/cpp/include/proton/message.hpp
index 2bba148..3bf345a 100644
--- a/proton-c/bindings/cpp/include/proton/message.hpp
+++ b/proton-c/bindings/cpp/include/proton/message.hpp
@@ -108,6 +108,10 @@ class message {
     /// @name Routing
     /// @{
 
+    PN_CPP_EXTERN void to(const std::string &addr);
+    PN_CPP_EXTERN std::string to() const;
+
+    /// These are aliases for to()
     PN_CPP_EXTERN void address(const std::string &addr);
     PN_CPP_EXTERN std::string address() const;
 
@@ -245,8 +249,8 @@ class message {
     /// @{
 
     /// Application properties map, can be modified in place.
-    PN_CPP_EXTERN property_map& application_properties();
-    PN_CPP_EXTERN const property_map& application_properties() const;
+    PN_CPP_EXTERN property_map& properties();
+    PN_CPP_EXTERN const property_map& properties() const;
 
     /// Message annotations map, can be modified in place.
     PN_CPP_EXTERN annotation_map& message_annotations();

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9be087df/proton-c/bindings/cpp/src/message.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/message.cpp b/proton-c/bindings/cpp/src/message.cpp
index d1ba2ee..d53ea56 100644
--- a/proton-c/bindings/cpp/src/message.cpp
+++ b/proton-c/bindings/cpp/src/message.cpp
@@ -101,15 +101,24 @@ std::string message::user_id() const {
     return str(pn_message_get_user_id(pn_msg()));
 }
 
-void message::address(const std::string &addr) {
+void message::to(const std::string &addr) {
     check(pn_message_set_address(pn_msg(), addr.c_str()));
 }
 
-std::string message::address() const {
+std::string message::to() const {
     const char* addr = pn_message_get_address(pn_msg());
     return addr ? std::string(addr) : std::string();
 }
 
+void message::address(const std::string &addr) {
+  check(pn_message_set_address(pn_msg(), addr.c_str()));
+}
+
+std::string message::address() const {
+  const char* addr = pn_message_get_address(pn_msg());
+  return addr ? std::string(addr) : std::string();
+}
+
 void message::subject(const std::string &s) {
     check(pn_message_set_subject(pn_msg(), s.c_str()));
 }
@@ -222,11 +231,11 @@ template<class M> M& put_map(pn_message_t* msg, pn_data_t* (*get)(pn_message_t*)
     return map;
 }
 
-message::property_map& message::application_properties() {
+message::property_map& message::properties() {
     return get_map(pn_msg(), pn_message_properties, application_properties_);
 }
 
-const message::property_map& message::application_properties() const {
+const message::property_map& message::properties() const {
     return get_map(pn_msg(), pn_message_properties, application_properties_);
 }
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9be087df/proton-c/bindings/cpp/src/message_test.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/message_test.cpp b/proton-c/bindings/cpp/src/message_test.cpp
index bfdbb06..d999970 100644
--- a/proton-c/bindings/cpp/src/message_test.cpp
+++ b/proton-c/bindings/cpp/src/message_test.cpp
@@ -45,7 +45,7 @@ void test_message_properties() {
 
     CHECK_MESSAGE_ID(id);
     CHECK_STR(user_id);
-    CHECK_STR(address);
+    CHECK_STR(to);
     CHECK_STR(subject);
     CHECK_STR(reply_to);
     CHECK_MESSAGE_ID(correlation_id);
@@ -62,7 +62,7 @@ void test_message_properties() {
     ASSERT_EQUAL("hello", get<std::string>(m2.body()));
     ASSERT_EQUAL(message_id("id"), m2.id());
     ASSERT_EQUAL("user_id", m2.user_id());
-    ASSERT_EQUAL("address", m2.address());
+    ASSERT_EQUAL("to", m2.to());
     ASSERT_EQUAL("subject", m2.subject());
     ASSERT_EQUAL("reply_to", m2.reply_to());
     ASSERT_EQUAL(message_id("correlation_id"), m2.correlation_id());
@@ -77,7 +77,7 @@ void test_message_properties() {
     ASSERT_EQUAL("hello", get<std::string>(m2.body()));
     ASSERT_EQUAL(message_id("id"), m2.id());
     ASSERT_EQUAL("user_id", m2.user_id());
-    ASSERT_EQUAL("address", m2.address());
+    ASSERT_EQUAL("to", m2.to());
     ASSERT_EQUAL("subject", m2.subject());
     ASSERT_EQUAL("reply_to", m2.reply_to());
     ASSERT_EQUAL(message_id("correlation_id"), m2.correlation_id());
@@ -105,32 +105,32 @@ void test_message_body() {
 void test_message_maps() {
     message m;
 
-    ASSERT(m.application_properties().empty());
+    ASSERT(m.properties().empty());
     ASSERT(m.message_annotations().empty());
     ASSERT(m.delivery_annotations().empty());
 
-    m.application_properties()["foo"] = 12;
+    m.properties()["foo"] = 12;
     m.delivery_annotations()["bar"] = "xyz";
 
     m.message_annotations()[23] = "23";
-    ASSERT_EQUAL(m.application_properties()["foo"], scalar(12));
+    ASSERT_EQUAL(m.properties()["foo"], scalar(12));
     ASSERT_EQUAL(m.delivery_annotations()["bar"], scalar("xyz"));
     ASSERT_EQUAL(m.message_annotations()[23], scalar("23"));
 
     message m2(m);
     message::annotation_map& amap = m2.delivery_annotations();
 
-    ASSERT_EQUAL(m2.application_properties()["foo"], scalar(12));
+    ASSERT_EQUAL(m2.properties()["foo"], scalar(12));
     ASSERT_EQUAL(m2.delivery_annotations()["bar"], scalar("xyz"));
     ASSERT_EQUAL(m2.message_annotations()[23], scalar("23"));
 
-    m.application_properties()["foo"] = "newfoo";
+    m.properties()["foo"] = "newfoo";
     m.delivery_annotations()[24] = 1000;
     m.message_annotations().erase(23);
 
     m2 = m;
-    ASSERT_EQUAL(1, m2.application_properties().size());
-    ASSERT_EQUAL(m2.application_properties()["foo"], scalar("newfoo"));
+    ASSERT_EQUAL(1, m2.properties().size());
+    ASSERT_EQUAL(m2.properties()["foo"], scalar("newfoo"));
     ASSERT_EQUAL(2, m2.delivery_annotations().size());
     ASSERT_EQUAL(m2.delivery_annotations()["bar"], scalar("xyz"));
     ASSERT_EQUAL(m2.delivery_annotations()[24], scalar(1000));


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


[3/3] qpid-proton git commit: PROTON-1180: [C++ binding] remove local_condition; rename remote_condition -> condition

Posted by as...@apache.org.
PROTON-1180: [C++ binding] remove local_condition; rename remote_condition -> condition


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

Branch: refs/heads/master
Commit: 288b1a6f76fa20f6414b64c03a7c6b5243b27797
Parents: 9be087d
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Apr 15 17:20:12 2016 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Fri Apr 15 17:20:12 2016 -0400

----------------------------------------------------------------------
 proton-c/bindings/cpp/include/proton/connection.hpp | 3 +--
 proton-c/bindings/cpp/include/proton/endpoint.hpp   | 5 +----
 proton-c/bindings/cpp/include/proton/link.hpp       | 3 +--
 proton-c/bindings/cpp/include/proton/session.hpp    | 3 +--
 proton-c/bindings/cpp/src/connection.cpp            | 8 ++------
 proton-c/bindings/cpp/src/engine_test.cpp           | 4 ++--
 proton-c/bindings/cpp/src/handler.cpp               | 8 ++++----
 proton-c/bindings/cpp/src/link.cpp                  | 8 ++------
 proton-c/bindings/cpp/src/session.cpp               | 8 ++------
 9 files changed, 16 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/288b1a6f/proton-c/bindings/cpp/include/proton/connection.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/connection.hpp b/proton-c/bindings/cpp/include/proton/connection.hpp
index 3b686f7..a451a9f 100644
--- a/proton-c/bindings/cpp/include/proton/connection.hpp
+++ b/proton-c/bindings/cpp/include/proton/connection.hpp
@@ -54,8 +54,7 @@ PN_CPP_CLASS_EXTERN connection : public internal::object<pn_connection_t>, publi
     /// Get the state of this connection.
     PN_CPP_EXTERN endpoint::state state() const;
 
-    PN_CPP_EXTERN condition local_condition() const;
-    PN_CPP_EXTERN condition remote_condition() const;
+    PN_CPP_EXTERN class condition condition() const;
 
     /// Get the container.
     ///

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/288b1a6f/proton-c/bindings/cpp/include/proton/endpoint.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/endpoint.hpp b/proton-c/bindings/cpp/include/proton/endpoint.hpp
index d59e093..809c2a3 100644
--- a/proton-c/bindings/cpp/include/proton/endpoint.hpp
+++ b/proton-c/bindings/cpp/include/proton/endpoint.hpp
@@ -58,11 +58,8 @@ PN_CPP_CLASS_EXTERN endpoint {
 
     /// XXX add endpoint state boolean operations
 
-    /// Get the local error condition.
-    virtual condition local_condition() const = 0;
-
     /// Get the error condition of the remote endpoint.
-    virtual condition remote_condition() const = 0;
+    virtual class condition condition() const = 0;
 
 #if PN_CPP_HAS_CPP11
     // Make everything explicit for C++11 compilers

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/288b1a6f/proton-c/bindings/cpp/include/proton/link.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/link.hpp b/proton-c/bindings/cpp/include/proton/link.hpp
index f917514..8e07704 100644
--- a/proton-c/bindings/cpp/include/proton/link.hpp
+++ b/proton-c/bindings/cpp/include/proton/link.hpp
@@ -57,8 +57,7 @@ PN_CPP_CLASS_EXTERN link : public internal::object<pn_link_t> , public endpoint
     /// Get the state of this link.
     PN_CPP_EXTERN endpoint::state state() const;
 
-    PN_CPP_EXTERN condition local_condition() const;
-    PN_CPP_EXTERN condition remote_condition() const;
+    PN_CPP_EXTERN class condition condition() const;
 
     /// Locally open the link.  The operation is not complete till
     /// handler::on_link_open.

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/288b1a6f/proton-c/bindings/cpp/include/proton/session.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/session.hpp b/proton-c/bindings/cpp/include/proton/session.hpp
index 450f035..74ffc21 100644
--- a/proton-c/bindings/cpp/include/proton/session.hpp
+++ b/proton-c/bindings/cpp/include/proton/session.hpp
@@ -52,8 +52,7 @@ PN_CPP_CLASS_EXTERN session : public internal::object<pn_session_t>, public endp
     /// Get the state of this session.
     PN_CPP_EXTERN endpoint::state state() const;
 
-    PN_CPP_EXTERN condition local_condition() const;
-    PN_CPP_EXTERN condition remote_condition() const;
+    PN_CPP_EXTERN class condition condition() const;
 
     /// @cond INTERNAL
     /// XXX needs to take connection options

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/288b1a6f/proton-c/bindings/cpp/src/connection.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/connection.cpp b/proton-c/bindings/cpp/src/connection.cpp
index fc61190..089f750 100644
--- a/proton-c/bindings/cpp/src/connection.cpp
+++ b/proton-c/bindings/cpp/src/connection.cpp
@@ -108,12 +108,8 @@ receiver connection::open_receiver(const std::string &addr, const link_options &
 
 endpoint::state connection::state() const { return pn_connection_state(pn_object()); }
 
-condition connection::local_condition() const {
-    return condition(pn_connection_condition(pn_object()));
-}
-
-condition connection::remote_condition() const {
-    return condition(pn_connection_remote_condition(pn_object()));
+condition connection::condition() const {
+    return pn_connection_remote_condition(pn_object());
 }
 
 void connection::user(const std::string &name) { pn_connection_set_user(pn_object(), name.c_str()); }

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/288b1a6f/proton-c/bindings/cpp/src/engine_test.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/engine_test.cpp b/proton-c/bindings/cpp/src/engine_test.cpp
index 0a14f76..99a003e 100644
--- a/proton-c/bindings/cpp/src/engine_test.cpp
+++ b/proton-c/bindings/cpp/src/engine_test.cpp
@@ -230,8 +230,8 @@ void test_transport_close() {
     while (!e.b.connection().closed()) e.process();
     ASSERT_EQUAL(1, hb.errors.size());
     ASSERT_EQUAL("oops: engine failure", hb.errors.front());
-    ASSERT_EQUAL("oops", e.b.connection().remote_condition().name());
-    ASSERT_EQUAL("engine failure", e.b.connection().remote_condition().description());
+    ASSERT_EQUAL("oops", e.b.connection().condition().name());
+    ASSERT_EQUAL("engine failure", e.b.connection().condition().description());
 }
 
 int main(int, char**) {

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/288b1a6f/proton-c/bindings/cpp/src/handler.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/handler.cpp b/proton-c/bindings/cpp/src/handler.cpp
index 3849fd8..d7d43d2 100644
--- a/proton-c/bindings/cpp/src/handler.cpp
+++ b/proton-c/bindings/cpp/src/handler.cpp
@@ -43,16 +43,16 @@ void handler::on_timer(container &) {}
 void handler::on_transport_close(transport &) {}
 void handler::on_transport_error(transport &t) { on_unhandled_error(t.condition()); }
 void handler::on_connection_close(connection &) {}
-void handler::on_connection_error(connection &c) { on_unhandled_error(c.remote_condition()); }
+void handler::on_connection_error(connection &c) { on_unhandled_error(c.condition()); }
 void handler::on_connection_open(connection &) {}
 void handler::on_session_close(session &) {}
-void handler::on_session_error(session &s) { on_unhandled_error(s.remote_condition()); }
+void handler::on_session_error(session &s) { on_unhandled_error(s.condition()); }
 void handler::on_session_open(session &) {}
 void handler::on_receiver_close(receiver &) {}
-void handler::on_receiver_error(receiver &l) { on_unhandled_error(l.remote_condition()); }
+void handler::on_receiver_error(receiver &l) { on_unhandled_error(l.condition()); }
 void handler::on_receiver_open(receiver &) {}
 void handler::on_sender_close(sender &) {}
-void handler::on_sender_error(sender &l) { on_unhandled_error(l.remote_condition()); }
+void handler::on_sender_error(sender &l) { on_unhandled_error(l.condition()); }
 void handler::on_sender_open(sender &) {}
 void handler::on_tracker_accept(tracker &) {}
 void handler::on_tracker_reject(tracker &) {}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/288b1a6f/proton-c/bindings/cpp/src/link.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/link.cpp b/proton-c/bindings/cpp/src/link.cpp
index 420711a..e31a656 100644
--- a/proton-c/bindings/cpp/src/link.cpp
+++ b/proton-c/bindings/cpp/src/link.cpp
@@ -103,12 +103,8 @@ endpoint::state link::state() const {
     return pn_link_state(pn_object());
 }
 
-condition link::local_condition() const {
-    return condition(pn_link_condition(pn_object()));
-}
-
-condition link::remote_condition() const {
-    return condition(pn_link_remote_condition(pn_object()));
+condition link::condition() const {
+    return pn_link_remote_condition(pn_object());
 }
 
 ssize_t link::recv(char* buffer, size_t size) {

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/288b1a6f/proton-c/bindings/cpp/src/session.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/session.cpp b/proton-c/bindings/cpp/src/session.cpp
index 37550b0..6deca10 100644
--- a/proton-c/bindings/cpp/src/session.cpp
+++ b/proton-c/bindings/cpp/src/session.cpp
@@ -67,12 +67,8 @@ receiver session::open_receiver(const std::string &addr, const link_options &lo)
 
 endpoint::state session::state() const { return pn_session_state(pn_object()); }
 
-condition session::local_condition() const {
-    return condition(pn_session_condition(pn_object()));
-}
-
-condition session::remote_condition() const {
-    return condition(pn_session_remote_condition(pn_object()));
+condition session::condition() const {
+    return pn_session_remote_condition(pn_object());
 }
 
 link_range session::links()  const {


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