Revert "Added getStoreDir() to MessageStore"

This reverts revision 882218 which broke the Windows.

It also assumes that a MessageStore has an associated directory, which
is not the case for all stores. We need a portable way to associate
extra state with a store.


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

6 files changed, 0 insertions, 10 deletions

diff --git a/cpp/src/qpid/broker/MessageStore.h b/cpp/src/qpid/broker/MessageStore.h
index f507e2a989..143e860ec7 100644
--- a/cpp/src/qpid/broker/MessageStore.h
+++ b/cpp/src/qpid/broker/MessageStore.h
@@ -192,8 +192,6 @@ 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 9a3a697547..5f7cceebd3 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/cpp/src/qpid/broker/MessageStoreModule.cpp
@@ -176,6 +176,4 @@ 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 279090a2f9..56b5a3c1ae 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/cpp/src/qpid/broker/MessageStoreModule.h
@@ -77,7 +77,6 @@ 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 d94aa321eb..6339b655f8 100644
--- a/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/cpp/src/qpid/broker/NullMessageStore.cpp
@@ -162,5 +162,4 @@ 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 8615258fc9..e148ec4d51 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/cpp/src/qpid/broker/NullMessageStore.h
@@ -89,8 +89,6 @@ class NullMessageStore : public MessageStore
 
     QPID_BROKER_EXTERN virtual bool isNull() const;
     static bool isNullStore(const MessageStore*);
-
-    std::string getStoreDir() const;
 };
 
 }
diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp
index cda9728dd4..6c2adf5c87 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/cpp/src/tests/QueueTest.cpp
@@ -409,8 +409,6 @@ class TestMessageStoreOC : public MessageStore
     void collectPreparedXids(std::set<std::string>& out) { out.insert(prepared.begin(), prepared.end()); }
 
     void recover(RecoveryManager&) {}
-
-    std::string getStoreDir() const { return std::string(); }
 };