From 7b69da362fa2f2d53ec5378539195b8a4a7cfa41 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kpvdr@apache.org>
Date: Thu, 14 Nov 2013 20:39:32 +0000
Subject: QPID-4984: Fix for recovery ambiguity issue, other code tidy-ups

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1542066 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp')

diff --git a/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp b/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp
index 3c2d7d69a2..4b8602318d 100644
--- a/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp
+++ b/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp
@@ -31,7 +31,8 @@
 //#include <iostream> // DEBUG
 
 namespace qpid {
-namespace qls_jrnl {
+namespace linearstore {
+namespace journal {
 
 EmptyFilePoolManager::EmptyFilePoolManager(const std::string& qlsStorePath,
                                            const efpPartitionNumber_t defaultPartitionNumber,
@@ -92,8 +93,8 @@ void EmptyFilePoolManager::findEfpPartitions() {
     }
 
     journalLogRef_.log(JournalLog::LOG_NOTICE, "EFP Manager initialization complete");
-    std::vector<qpid::qls_jrnl::EmptyFilePoolPartition*> partitionList;
-    std::vector<qpid::qls_jrnl::EmptyFilePool*> filePoolList;
+    std::vector<qpid::linearstore::journal::EmptyFilePoolPartition*> partitionList;
+    std::vector<qpid::linearstore::journal::EmptyFilePool*> filePoolList;
     getEfpPartitions(partitionList);
     if (partitionList.size() == 0) {
         journalLogRef_.log(JournalLog::LOG_WARN, "NO EFP PARTITIONS FOUND! No queue creation is possible.");
@@ -101,14 +102,14 @@ void EmptyFilePoolManager::findEfpPartitions() {
         std::stringstream oss;
         oss << "> EFP Partitions found: " << partitionList.size();
         journalLogRef_.log(JournalLog::LOG_INFO, oss.str());
-        for (std::vector<qpid::qls_jrnl::EmptyFilePoolPartition*>::const_iterator i=partitionList.begin(); i!= partitionList.end(); ++i) {
+        for (std::vector<qpid::linearstore::journal::EmptyFilePoolPartition*>::const_iterator i=partitionList.begin(); i!= partitionList.end(); ++i) {
             filePoolList.clear();
             (*i)->getEmptyFilePools(filePoolList);
             std::stringstream oss;
             oss << "  * Partition " << (*i)->getPartitionNumber() << " containing " << filePoolList.size()
                 << " pool" << (filePoolList.size()>1 ? "s" : "") << " at \'" << (*i)->getPartitionDirectory() << "\'";
             journalLogRef_.log(JournalLog::LOG_INFO, oss.str());
-            for (std::vector<qpid::qls_jrnl::EmptyFilePool*>::const_iterator j=filePoolList.begin(); j!=filePoolList.end(); ++j) {
+            for (std::vector<qpid::linearstore::journal::EmptyFilePool*>::const_iterator j=filePoolList.begin(); j!=filePoolList.end(); ++j) {
                 std::ostringstream oss;
                 oss << "    - EFP \'" << (*j)->dataSize_kib() << "k\' containing " << (*j)->numEmptyFiles() <<
                               " files of size " << (*j)->dataSize_kib() << " KiB totaling " << (*j)->cumFileSize_kib() << " KiB";
@@ -208,4 +209,4 @@ uint16_t EmptyFilePoolManager::getNumEfpPartitions() const {
     return partitionMap_.size();
 }
 
-}} // namespace qpid::qls_jrnl
+}}}
-- 
cgit v1.2.1