svn commit: r540108 - /incubator/qpid/trunk/qpid/cpp/src/qpid/CommonOptions.cpp

[gsim]

Author: gsim
Date: Mon May 21 04:04:31 2007
New Revision: 540108

URL: http://svn.apache.org/viewvc?view=rev&rev=540108
Log:
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'.


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/CommonOptions.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/CommonOptions.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/CommonOptions.cpp?view=diff&rev=540108&r1=540107&r2=540108
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/CommonOptions.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/CommonOptions.cpp Mon May 21 
04:04:31 2007
@@ -28,9 +28,10 @@
 }
     
 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;