Repository: qpid-proton
Updated Branches:
  refs/heads/master 5bc84443c -> d15cbd84c


PROTON-1860: [cpp] connection::container_id returns the *remote* container-id


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

Branch: refs/heads/master
Commit: 563c9ee9fd6aa150df3f1d6291f2dd89c2741879
Parents: 5bc8444
Author: Alan Conway <acon...@redhat.com>
Authored: Wed Jun 13 12:30:47 2018 -0400
Committer: Alan Conway <acon...@redhat.com>
Committed: Wed Jun 13 12:30:47 2018 -0400

----------------------------------------------------------------------
 cpp/include/proton/connection.hpp | 4 ++--
 cpp/src/connection.cpp            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/563c9ee9/cpp/include/proton/connection.hpp
----------------------------------------------------------------------
diff --git a/cpp/include/proton/connection.hpp 
b/cpp/include/proton/connection.hpp
index 298a4be..77bf96d 100644
--- a/cpp/include/proton/connection.hpp
+++ b/cpp/include/proton/connection.hpp
@@ -69,10 +69,10 @@ PN_CPP_CLASS_EXTERN connection : public 
internal::object<pn_connection_t>, publi
     /// Get the transport for the connection.
     PN_CPP_EXTERN class transport transport() const;
 
-    /// Return the AMQP hostname attribute for the connection.
+    /// Return the remote AMQP hostname attribute for the connection.
     PN_CPP_EXTERN std::string virtual_host() const;
 
-    /// Return the container ID for the connection.
+    /// Return the remote container ID for the connection.
     PN_CPP_EXTERN std::string container_id() const;
 
     /// Return authenticated user for the connection

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/563c9ee9/cpp/src/connection.cpp
----------------------------------------------------------------------
diff --git a/cpp/src/connection.cpp b/cpp/src/connection.cpp
index 8060059..610beee 100644
--- a/cpp/src/connection.cpp
+++ b/cpp/src/connection.cpp
@@ -65,7 +65,7 @@ std::string connection::virtual_host() const {
 }
 
 std::string connection::container_id() const {
-    return str(pn_connection_get_container(pn_object()));
+    return str(pn_connection_remote_container(pn_object()));
 }
 
 std::string connection::user() const {


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

Reply via email to