From b2ecc039c6ca1b4116d26750f2d657cbf6f83984 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Tue, 23 Feb 2016 22:24:10 +0100 Subject: [PATCH] fixed looukp path --- arangod/VocBase/vocbase.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/arangod/VocBase/vocbase.cpp b/arangod/VocBase/vocbase.cpp index 83b1681744..5deca0e38a 100644 --- a/arangod/VocBase/vocbase.cpp +++ b/arangod/VocBase/vocbase.cpp @@ -41,6 +41,7 @@ #include "Basics/tri-strings.h" #include "Basics/threads.h" #include "Basics/Exceptions.h" +#include "Basics/FileUtils.h" #include "Utils/CollectionKeysRepository.h" #include "Utils/CursorRepository.h" #include "Utils/transactions.h" @@ -785,20 +786,12 @@ static int ScanPath(TRI_vocbase_t* vocbase, char const* path, bool isUpgrade, for (auto const& name : files) { TRI_ASSERT(!name.empty()); - if (!StringUtils::isSuffix(name, "collection-")) { + if (!StringUtils::isPrefix(name, "collection-")) { // no match, ignore this file continue; } - char* filePtr = TRI_Concatenate2File(path, name.c_str()); - - if (filePtr == nullptr) { - LOG(FATAL) << "out of memory"; - FATAL_ERROR_EXIT(); - } - - std::string file = filePtr; - TRI_FreeString(TRI_CORE_MEM_ZONE, filePtr); + std::string file = FileUtils::buildFilename(path, name); if (TRI_IsDirectory(file.c_str())) { if (!TRI_IsWritable(file.c_str())) {