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

5 files changed, 28 insertions, 18 deletions

diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
index 5828449d5e..30b75ff4ff 100644
--- a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
@@ -91,16 +91,17 @@ void convert(const Variant::Map& from, ConnectionSettings& to)
     setIfFound(from, "max-frame-size", to.maxFrameSize);
     setIfFound(from, "bounds", to.bounds);
 
-    setIfFound(from, "protocol", to.protocol);
+    setIfFound(from, "transport", to.protocol);
 }
 
-ConnectionImpl::ConnectionImpl(const Variant::Map& options) : 
+ConnectionImpl::ConnectionImpl(const std::string& url, const Variant::Map& options) : 
     reconnect(true), timeout(-1), limit(-1),
     minReconnectInterval(3), maxReconnectInterval(60),
     retries(0)
 {
     QPID_LOG(debug, "Created connection with " << options);
     setOptions(options);
+    urls.push_back(url);
 }
 
 void ConnectionImpl::setOptions(const Variant::Map& options)
@@ -127,12 +128,6 @@ void ConnectionImpl::setOption(const std::string& name, const Variant& value)
     QPID_LOG(debug, "Set " << name << " to " << value);
 }
 
-void ConnectionImpl::open(const std::string& u)
-{
-    urls.push_back(u);
-    connect();
-}
-
 void ConnectionImpl::close()
 {
     std::vector<std::string> names;
@@ -143,11 +138,21 @@ void ConnectionImpl::close()
     for (std::vector<std::string>::const_iterator i = names.begin(); i != names.end(); ++i) {
         getSession(*i).close();
     }
+    detach();
+}
 
+void ConnectionImpl::detach()
+{
     qpid::sys::Mutex::ScopedLock l(lock);
     connection.close();
 }
 
+bool ConnectionImpl::isConnected()
+{
+    qpid::sys::Mutex::ScopedLock l(lock);
+    return connection.isOpen();
+}
+
 boost::intrusive_ptr<SessionImpl> getImplPtr(qpid::messaging::Session& session)
 {
     return boost::dynamic_pointer_cast<SessionImpl>(
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
index 2c59d8add8..9d992c1375 100644
--- a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
+++ b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
@@ -39,13 +39,14 @@ class SessionImpl;
 class ConnectionImpl : public qpid::messaging::ConnectionImpl
 {
   public:
-    ConnectionImpl(const qpid::types::Variant::Map& options);
-    void open(const std::string& url);
+    ConnectionImpl(const std::string& url, const qpid::types::Variant::Map& options);
+    void connect();
+    bool isConnected();
     void close();
     qpid::messaging::Session newSession(bool transactional, const std::string& name);
     qpid::messaging::Session getSession(const std::string& name) const;
     void closed(SessionImpl&);
-    void connect();
+    void detach();
     void setOption(const std::string& name, const qpid::types::Variant& value);
   private:
     typedef std::map<std::string, qpid::messaging::Session> Sessions;
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
index 8f9751a967..969ad93da9 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
+++ b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
@@ -108,7 +108,7 @@ void SessionImpl::close()
     for (std::vector<std::string>::const_iterator i = s.begin(); i != s.end(); ++i) getSender(*i).close();
     for (std::vector<std::string>::const_iterator i = r.begin(); i != r.end(); ++i) getReceiver(*i).close();
     
-
+    
     connection->closed(*this);
     session.close();
 }
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)
diff --git a/cpp/src/qpid/messaging/ConnectionImpl.h b/cpp/src/qpid/messaging/ConnectionImpl.h
index 474f486736..148105476d 100644
--- a/cpp/src/qpid/messaging/ConnectionImpl.h
+++ b/cpp/src/qpid/messaging/ConnectionImpl.h
@@ -38,7 +38,9 @@ class ConnectionImpl : public virtual qpid::RefCounted
 {
   public:
     virtual ~ConnectionImpl() {}
-    virtual void open(const std::string& url) = 0;
+    virtual void connect() = 0;
+    virtual bool isConnected() = 0;
+    virtual void detach() = 0;
     virtual void close() = 0;
     virtual Session newSession(bool transactional, const std::string& name) = 0;
     virtual Session getSession(const std::string& name) const = 0;