Temporary hack to the logic used in parsing environment options to avoid treating QPID_DIR (used in external modules) from being treated as an (invalid) option 'dir'.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/cpp/src/qpid/CommonOptions.cpp b/cpp/src/qpid/CommonOptions.cpp
index 1b08943088..8ec1a42ee2 100644
--- a/cpp/src/qpid/CommonOptions.cpp
+++ b/cpp/src/qpid/CommonOptions.cpp
@@ -28,9 +28,10 @@ char env2optchar(char env) {
 }
     
 const std::string envPrefix("QPID_");
+const std::string ignore("QPID_DIR");//temporary hack - this env var is used in other ways; not an option
 
 std::string env2option(const std::string& env) {
-    if (env.find(envPrefix) ==0) {
+    if (env != ignore /*temp hack, see above*/ && env.find(envPrefix) == 0) {
         std::string opt = env.substr(envPrefix.size());
         std::transform(opt.begin(), opt.end(), opt.begin(), env2optchar);
         return opt;