QPID-664: changed open() to connect(), moved url parameter to constructor, added detach() and isConnected()

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@931852 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 5 deletions

diff --git a/cpp/src/qpid/messaging/Connection.cpp b/cpp/src/qpid/messaging/Connection.cpp
index b9437c7931..81a72bb876 100644
--- a/cpp/src/qpid/messaging/Connection.cpp
+++ b/cpp/src/qpid/messaging/Connection.cpp
@@ -39,22 +39,24 @@ Connection::Connection(const Connection& c) : Handle<ConnectionImpl>() { PI::cop
 Connection& Connection::operator=(const Connection& c) { return PI::assign(*this, c); }
 Connection::~Connection() { PI::dtor(*this); }
 
-Connection::Connection(const std::string& o)
+Connection::Connection(const std::string& url, const std::string& o)
 { 
     Variant::Map options;
     AddressParser parser(o);
     if (o.empty() || parser.parseMap(options)) {
-        PI::ctor(*this, new qpid::client::amqp0_10::ConnectionImpl(options));
+        PI::ctor(*this, new qpid::client::amqp0_10::ConnectionImpl(url, options));
     } else {
         throw InvalidOptionString(o);
     }
 }
-Connection::Connection(const Variant::Map& options)
+Connection::Connection(const std::string& url, const Variant::Map& options)
 {
-    PI::ctor(*this, new qpid::client::amqp0_10::ConnectionImpl(options));
+    PI::ctor(*this, new qpid::client::amqp0_10::ConnectionImpl(url, options));
 }
 
-void Connection::open(const std::string& url) { impl->open(url); }
+void Connection::connect() { impl->connect(); }
+bool Connection::isConnected() { return impl->isConnected(); }
+void Connection::detach() { impl->detach(); }
 void Connection::close() { impl->close(); }
 Session Connection::createSession(const std::string& name) { return impl->newSession(false, name); }
 Session Connection::createTransactionalSession(const std::string& name)