summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2014-03-14 22:14:50 +0000
committerAndrew Stitcher <astitcher@apache.org>2014-03-14 22:14:50 +0000
commit38563ea3945b6973e35bab7b9537188c5271bdc5 (patch)
tree4f4d36bec3e1d2c359a745b03a68433433893eb6
parentbf75e56731bfd5a45fc18f41d46514648802da87 (diff)
downloadqpid-python-38563ea3945b6973e35bab7b9537188c5271bdc5.tar.gz
QPID-5630: Windows C++ broker never loads modules using --module-dir
- Need to use full path to load modules instead of just the filename. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1577742 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp b/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
index e090747715..5128f0f8d6 100644
--- a/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
@@ -79,7 +79,9 @@ void FileSysDir::forEachFile(Callback cb) const {
// process everything that isn't a directory
do {
if (!(findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
- std::string fileName(findFileData.cFileName);
+ std::string fileName(dirPath);
+ fileName += "\\";
+ fileName += findFileData.cFileName;
cb(fileName);
}
} while (FindNextFile(hFind, &findFileData) != 0);