summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2011-01-17 10:24:35 +0000
committerGordon Sim <gsim@apache.org>2011-01-17 10:24:35 +0000
commit7810b4b3407be896f6c600d6231a1f7049adec1d (patch)
tree2edf72ccf87a741cbe3d19b2adf061e10bb4904d
parent2b73bd3fa303bf048d4b7f361a30652f6ffa9079 (diff)
downloadqpid-python-7810b4b3407be896f6c600d6231a1f7049adec1d.tar.gz
QPID-3001: Add const version of Connection::isOpen()
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1059846 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/include/qpid/messaging/Connection.h1
-rw-r--r--qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp2
-rw-r--r--qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h2
-rw-r--r--qpid/cpp/src/qpid/messaging/Connection.cpp1
-rw-r--r--qpid/cpp/src/qpid/messaging/ConnectionImpl.h2
5 files changed, 5 insertions, 3 deletions
diff --git a/qpid/cpp/include/qpid/messaging/Connection.h b/qpid/cpp/include/qpid/messaging/Connection.h
index 59f5616a2f..1ad7a7242f 100644
--- a/qpid/cpp/include/qpid/messaging/Connection.h
+++ b/qpid/cpp/include/qpid/messaging/Connection.h
@@ -90,6 +90,7 @@ class Connection : public qpid::messaging::Handle<ConnectionImpl>
QPID_MESSAGING_EXTERN void setOption(const std::string& name, const qpid::types::Variant& value);
QPID_MESSAGING_EXTERN void open();
QPID_MESSAGING_EXTERN bool isOpen();
+ QPID_MESSAGING_EXTERN bool isOpen() const;
/**
* Closes a connection and all sessions associated with it. An
* opened connection must be closed before the last handle is
diff --git a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
index f3cc4f7cc1..a60177a5d8 100644
--- a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
@@ -166,7 +166,7 @@ void ConnectionImpl::detach()
connection.close();
}
-bool ConnectionImpl::isOpen()
+bool ConnectionImpl::isOpen() const
{
qpid::sys::Mutex::ScopedLock l(lock);
return connection.isOpen();
diff --git a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
index 8467376725..8562add6b1 100644
--- a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
@@ -43,7 +43,7 @@ class ConnectionImpl : public qpid::messaging::ConnectionImpl
public:
ConnectionImpl(const std::string& url, const qpid::types::Variant::Map& options);
void open();
- bool isOpen();
+ bool isOpen() const;
void close();
qpid::messaging::Session newSession(bool transactional, const std::string& name);
qpid::messaging::Session getSession(const std::string& name) const;
diff --git a/qpid/cpp/src/qpid/messaging/Connection.cpp b/qpid/cpp/src/qpid/messaging/Connection.cpp
index e132b6e899..bd90aa54a7 100644
--- a/qpid/cpp/src/qpid/messaging/Connection.cpp
+++ b/qpid/cpp/src/qpid/messaging/Connection.cpp
@@ -63,6 +63,7 @@ Connection::Connection()
void Connection::open() { impl->open(); }
bool Connection::isOpen() { return impl->isOpen(); }
+bool Connection::isOpen() const { return impl->isOpen(); }
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/qpid/cpp/src/qpid/messaging/ConnectionImpl.h b/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
index fb45ee5e8b..1e11d9a6d5 100644
--- a/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
+++ b/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
@@ -39,7 +39,7 @@ class ConnectionImpl : public virtual qpid::RefCounted
public:
virtual ~ConnectionImpl() {}
virtual void open() = 0;
- virtual bool isOpen() = 0;
+ virtual bool isOpen() const = 0;
virtual void close() = 0;
virtual Session newSession(bool transactional, const std::string& name) = 0;
virtual Session getSession(const std::string& name) const = 0;