5 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/qpid/broker/MessageStore.h b/cpp/src/qpid/broker/MessageStore.h
index 143e860ec7..f507e2a989 100644
--- a/cpp/src/qpid/broker/MessageStore.h
+++ b/cpp/src/qpid/broker/MessageStore.h
@@ -192,6 +192,8 @@ class MessageStore : public TransactionalStore, public Recoverable {
      */
     virtual uint32_t outstandingQueueAIO(const PersistableQueue& queue) = 0;
 
+    /**@return store directory or empty string if this is a null store.  */
+    virtual std::string getStoreDir() const = 0;
 
     virtual ~MessageStore(){}
 };
diff --git a/cpp/src/qpid/broker/MessageStoreModule.cpp b/cpp/src/qpid/broker/MessageStoreModule.cpp
index 5f7cceebd3..9a3a697547 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/cpp/src/qpid/broker/MessageStoreModule.cpp
@@ -176,4 +176,6 @@ bool MessageStoreModule::isNull() const
     return NullMessageStore::isNullStore(store.get());
 }
 
+std::string MessageStoreModule::getStoreDir() const { return store->getStoreDir(); }
+
 }} // namespace qpid::broker
diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/cpp/src/qpid/broker/MessageStoreModule.h
index 56b5a3c1ae..279090a2f9 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/cpp/src/qpid/broker/MessageStoreModule.h
@@ -77,6 +77,7 @@ class MessageStoreModule : public MessageStore
     void flush(const qpid::broker::PersistableQueue& queue);
     bool isNull() const;
 
+    virtual std::string getStoreDir() const;
     ~MessageStoreModule();
 };
 
diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/cpp/src/qpid/broker/NullMessageStore.cpp
index 6339b655f8..d94aa321eb 100644
--- a/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/cpp/src/qpid/broker/NullMessageStore.cpp
@@ -162,4 +162,5 @@ bool NullMessageStore::isNullStore(const MessageStore* store)
     }
 }
 
+std::string NullMessageStore::getStoreDir() const { return std::string(); }
 }}  // namespace qpid::broker
diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/cpp/src/qpid/broker/NullMessageStore.h
index e148ec4d51..8615258fc9 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/cpp/src/qpid/broker/NullMessageStore.h
@@ -89,6 +89,8 @@ class NullMessageStore : public MessageStore
 
     QPID_BROKER_EXTERN virtual bool isNull() const;
     static bool isNullStore(const MessageStore*);
+
+    std::string getStoreDir() const;
 };
 
 }