From f5157fbb36bef62dcfac69667b366fd3293af0f9 Mon Sep 17 00:00:00 2001 From: Ted Ross 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/ConnectionImpl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/client/ConnectionImpl.cpp') diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp index db97f1e0f4..963e56b9b2 100644 --- a/cpp/src/qpid/client/ConnectionImpl.cpp +++ b/cpp/src/qpid/client/ConnectionImpl.cpp @@ -115,8 +115,10 @@ public: ioThreads(0), connections(0) { + CommonOptions common("", QPIDC_CONF_FILE); IOThreadOptions options(c); - options.parse(0, 0, QPIDC_CONF_FILE, true); + common.parse(0, 0, common.config, true); + options.parse(0, 0, common.config, true); maxIOThreads = (options.maxIOThreads != -1) ? options.maxIOThreads : 1; } -- cgit v1.2.1