From f5157fbb36bef62dcfac69667b366fd3293af0f9 Mon Sep 17 00:00:00 2001
From: Ted Ross <tross@apache.org>
Date: Fri, 20 Apr 2012 20:43:14 +0000
Subject: QPID-3510 - Allow client configuration-file to be overridden via
 QPID_CONFIG env variable.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1328494 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/client/LoadPlugins.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'cpp/src/qpid/client/LoadPlugins.cpp')

diff --git a/cpp/src/qpid/client/LoadPlugins.cpp b/cpp/src/qpid/client/LoadPlugins.cpp
index 246eb60c67..a8cfe80dc8 100644
--- a/cpp/src/qpid/client/LoadPlugins.cpp
+++ b/cpp/src/qpid/client/LoadPlugins.cpp
@@ -39,10 +39,12 @@ namespace {
 
 struct LoadtimeInitialise {
     LoadtimeInitialise() {
+        CommonOptions common("", QPIDC_CONF_FILE);
         qpid::ModuleOptions moduleOptions(QPIDC_MODULE_DIR);
         string              defaultPath (moduleOptions.loadDir);
-        moduleOptions.parse (0, 0, QPIDC_CONF_FILE, true);
-    
+        common.parse(0, 0, common.config, true);
+        moduleOptions.parse (0, 0, common.config, true);
+
         for (vector<string>::iterator iter = moduleOptions.load.begin();
              iter != moduleOptions.load.end();
              iter++)
-- 
cgit v1.2.1