15 files changed, 22 insertions, 13 deletions
diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.cpp b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
index 0d8ff1535e..bcaac5c548 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
@@ -90,6 +90,12 @@ AsyncOperation::getOpStr() const
     return getOpStr(m_op);
 }
 
+boost::shared_ptr<qpid::broker::BrokerAsyncContext>
+AsyncOperation::getBrokerContext() const
+{
+    return m_brokerCtxt;
+}
+
 //static
 const char*
 AsyncOperation::getOpStr(const opCode op)
diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.h b/cpp/src/qpid/asyncStore/AsyncOperation.h
index 24f8baeb4d..188750e910 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.h
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.h
@@ -67,7 +67,9 @@ public:
     virtual ~AsyncOperation();
     const char* getOpStr() const;
     static const char* getOpStr(const opCode op);
+    boost::shared_ptr<qpid::broker::BrokerAsyncContext> getBrokerContext() const;
 
+private:
     opCode m_op;
     const qpid::broker::IdHandle* m_targetHandle;
     const qpid::broker::DataSource* const m_dataSrc;
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
index 60365e0e8a..3f2058a94c 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
+++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
@@ -116,7 +116,7 @@ public:
                             uint64_t offset,
                             const uint64_t length);
 
-protected:
+private:
     boost::shared_ptr<qpid::sys::Poller> m_poller;
     AsyncStoreOptions m_opts;
     RunState m_runState;
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
index 6dac318d14..7037ca226f 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
@@ -57,7 +57,7 @@ void
 AsyncStoreOptions::validate()
 {}
 
-//static
+// private static
 std::string&
 AsyncStoreOptions::getDefaultStoreDir()
 {
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreOptions.h b/cpp/src/qpid/asyncStore/AsyncStoreOptions.h
index bc1b6a2f9f..2849e3d2c6 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreOptions.h
+++ b/cpp/src/qpid/asyncStore/AsyncStoreOptions.h
@@ -48,7 +48,7 @@ public:
 
     std::string m_storeDir;
 
-protected:
+private:
     // Static initialization race condition avoidance with static instance of Plugin class (using construct-on-first-use idiom).
     static std::string& getDefaultStoreDir();
 };
diff --git a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.h b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.h
index 82f3e5c47e..f976b6d246 100644
--- a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.h
@@ -41,7 +41,7 @@ public:
     EnqueueHandleImpl(qpid::broker::MessageHandle& msgHandle,
                       qpid::broker::QueueHandle& queueHandle);
     virtual ~EnqueueHandleImpl();
-protected:
+private:
     qpid::broker::MessageHandle& m_msgHandle;
     qpid::broker::QueueHandle& m_queueHandle;
 };
diff --git a/cpp/src/qpid/asyncStore/EventHandleImpl.h b/cpp/src/qpid/asyncStore/EventHandleImpl.h
index 9ed841b8c0..1c6bc52f9f 100644
--- a/cpp/src/qpid/asyncStore/EventHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/EventHandleImpl.h
@@ -41,7 +41,7 @@ public:
                     const std::string& key = std::string());
     virtual ~EventHandleImpl();
     const std::string& getKey() const;
-protected:
+private:
     qpid::broker::QueueHandle& m_queueHandle;
     std::string m_key;
 };
diff --git a/cpp/src/qpid/asyncStore/MessageHandleImpl.h b/cpp/src/qpid/asyncStore/MessageHandleImpl.h
index 0907ac5e65..eb80fca2d4 100644
--- a/cpp/src/qpid/asyncStore/MessageHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/MessageHandleImpl.h
@@ -39,7 +39,7 @@ class MessageHandleImpl : public virtual qpid::RefCounted
 public:
     MessageHandleImpl(const qpid::broker::DataSource* dataSrc);
     virtual ~MessageHandleImpl();
-protected:
+private:
     const qpid::broker::DataSource* m_dataSrc;
 };
 
diff --git a/cpp/src/qpid/asyncStore/OperationQueue.cpp b/cpp/src/qpid/asyncStore/OperationQueue.cpp
index a455e445ab..4eabf82004 100644
--- a/cpp/src/qpid/asyncStore/OperationQueue.cpp
+++ b/cpp/src/qpid/asyncStore/OperationQueue.cpp
@@ -46,13 +46,13 @@ OperationQueue::submit(boost::shared_ptr<const AsyncOperation> op)
     m_opQueue.push(op);
 }
 
-// protected
+// private
 OperationQueue::OpQueue::Batch::const_iterator
 OperationQueue::handle(const OperationQueue::OpQueue::Batch& e)
 {
     for (OpQueue::Batch::const_iterator i = e.begin(); i != e.end(); ++i) {
 //std::cout << "<-- OperationQueue::handle() Op=" << (*i)->getOpStr() << std::endl << std::flush;
-        boost::shared_ptr<qpid::broker::BrokerAsyncContext> bc = (*i)->m_brokerCtxt;
+        boost::shared_ptr<qpid::broker::BrokerAsyncContext> bc = (*i)->getBrokerContext();
         if (bc) {
             qpid::broker::AsyncResultQueue* const arq = bc->getAsyncResultQueue();
             if (arq) {
diff --git a/cpp/src/qpid/asyncStore/OperationQueue.h b/cpp/src/qpid/asyncStore/OperationQueue.h
index 23f1c0ee13..d2bd5d0f26 100644
--- a/cpp/src/qpid/asyncStore/OperationQueue.h
+++ b/cpp/src/qpid/asyncStore/OperationQueue.h
@@ -39,7 +39,7 @@ public:
     virtual ~OperationQueue();
     void submit(boost::shared_ptr<const AsyncOperation> op);
 
-protected:
+private:
     typedef qpid::sys::PollableQueue<boost::shared_ptr<const AsyncOperation> > OpQueue;
     OpQueue m_opQueue;
 
diff --git a/cpp/src/qpid/asyncStore/Plugin.h b/cpp/src/qpid/asyncStore/Plugin.h
index cbb0bfdadb..7cf500a122 100644
--- a/cpp/src/qpid/asyncStore/Plugin.h
+++ b/cpp/src/qpid/asyncStore/Plugin.h
@@ -40,7 +40,7 @@ public:
     virtual void initialize(Target& target);
     void finalize();
     virtual qpid::Options* getOptions();
-protected:
+private:
     boost::shared_ptr<qpid::asyncStore::AsyncStoreImpl> m_store;
     qpid::asyncStore::AsyncStoreOptions m_options;
 };
diff --git a/cpp/src/qpid/asyncStore/QueueHandleImpl.h b/cpp/src/qpid/asyncStore/QueueHandleImpl.h
index 9046a33877..a8a1862554 100644
--- a/cpp/src/qpid/asyncStore/QueueHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/QueueHandleImpl.h
@@ -41,7 +41,7 @@ public:
 
     const std::string& getName() const;
 
-protected:
+private:
     const std::string m_name;
     const qpid::types::Variant::Map& m_opts;
 
diff --git a/cpp/src/qpid/asyncStore/RunState.cpp b/cpp/src/qpid/asyncStore/RunState.cpp
index 3605a0c2e1..737d8eb367 100644
--- a/cpp/src/qpid/asyncStore/RunState.cpp
+++ b/cpp/src/qpid/asyncStore/RunState.cpp
@@ -105,6 +105,7 @@ RunState::s_toStr(const RunState_t s)
     }
 }
 
+// private
 void
 RunState::set(const RunState_t s)
 {
diff --git a/cpp/src/qpid/asyncStore/RunState.h b/cpp/src/qpid/asyncStore/RunState.h
index 959e47449d..dfa331ea1a 100644
--- a/cpp/src/qpid/asyncStore/RunState.h
+++ b/cpp/src/qpid/asyncStore/RunState.h
@@ -73,7 +73,7 @@ public:
     void setStopped();
     virtual const char* getAsStr() const;
     static const char* s_toStr(const RunState_t s);
-protected:
+private:
     virtual void set(const RunState_t s);
 
 };
diff --git a/cpp/src/qpid/asyncStore/TxnHandleImpl.h b/cpp/src/qpid/asyncStore/TxnHandleImpl.h
index d001fd1916..b28eb0cd4b 100644
--- a/cpp/src/qpid/asyncStore/TxnHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/TxnHandleImpl.h
@@ -38,7 +38,7 @@ public:
     virtual ~TxnHandleImpl();
     const std::string& getXid() const;
     bool is2pc() const;
-protected:
+private:
     std::string m_xid;
     bool m_tpcFlag;
 };