QPID-2231: Cluster + store fails with default data-directory

A broker started with cluster and store enabled and using the Unix
default data-directory "$HOME/.qpidd" fails with:
   Daemon startup failed: boost::filesystem::path: invalid name ".qpidd" in path: "/home/remote/aconway/.qpidd"

It would also fail for any user-selected directory name that does not
conform to boost "portable filename" syntax.


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

1 files changed, 7 insertions, 7 deletions

diff --git a/qpid/cpp/src/qpid/cluster/StoreStatus.cpp b/qpid/cpp/src/qpid/cluster/StoreStatus.cpp
index 72e4891566..6e412c23f7 100644
--- a/qpid/cpp/src/qpid/cluster/StoreStatus.cpp
+++ b/qpid/cpp/src/qpid/cluster/StoreStatus.cpp
@@ -30,7 +30,7 @@ namespace cluster {
 
 using framing::Uuid;
 using namespace framing::cluster;
-using namespace boost::filesystem;
+namespace fs=boost::filesystem;
 using std::ostream;
 
 StoreStatus::StoreStatus(const std::string& d)
@@ -43,17 +43,17 @@ const char* SUBDIR="cluster";
 const char* CLUSTER_ID_FILE="cluster.uuid";
 const char* SHUTDOWN_ID_FILE="shutdown.uuid";
 
-Uuid loadUuid(const path& path) {
+Uuid loadUuid(const fs::path& path) {
     Uuid ret;
     if (exists(path)) {
-        ifstream i(path);
+        fs::ifstream i(path);
         i >> ret;
     }
     return ret;
 }
 
-void saveUuid(const path& path, const Uuid& uuid) {
-    ofstream o(path);
+void saveUuid(const fs::path& path, const Uuid& uuid) {
+    fs::ofstream o(path);
     o << uuid;
 }
 
@@ -61,7 +61,7 @@ void saveUuid(const path& path, const Uuid& uuid) {
 
 
 void StoreStatus::load() {
-    path dir = path(dataDir)/SUBDIR;
+    fs::path dir = fs::path(dataDir, fs::native)/SUBDIR;
     create_directory(dir);
     clusterId = loadUuid(dir/CLUSTER_ID_FILE);
     shutdownId = loadUuid(dir/SHUTDOWN_ID_FILE);
@@ -72,7 +72,7 @@ void StoreStatus::load() {
 }
 
 void StoreStatus::save() {
-    path dir = path(dataDir)/SUBDIR;
+    fs::path dir = fs::path(dataDir, fs::native)/SUBDIR;
     create_directory(dir);
     saveUuid(dir/CLUSTER_ID_FILE, clusterId);
     saveUuid(dir/SHUTDOWN_ID_FILE, shutdownId);