summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/client/ConnectionImpl.cpp
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2012-04-23 13:44:11 +0000
committerTed Ross <tross@apache.org>2012-04-23 13:44:11 +0000
commit5ce9c0625e80ba10b8b067fef8856b7941c66d1f (patch)
tree2ad4f1ee52573107de0ef91f8a0bd2dff9d4f6c3 /cpp/src/qpid/client/ConnectionImpl.cpp
parenta53f2eb6572c7dbe7da66a2cdc34c24cc0ff8d58 (diff)
downloadqpid-python-5ce9c0625e80ba10b8b067fef8856b7941c66d1f.tar.gz
QPID-3510 - Created a separate option in CommonOptions for the client configuration file.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1329236 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/client/ConnectionImpl.cpp')
-rw-r--r--cpp/src/qpid/client/ConnectionImpl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index 963e56b9b2..85b0e8303e 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -115,10 +115,10 @@ public:
ioThreads(0),
connections(0)
{
- CommonOptions common("", QPIDC_CONF_FILE);
+ CommonOptions common("", "", QPIDC_CONF_FILE);
IOThreadOptions options(c);
- common.parse(0, 0, common.config, true);
- options.parse(0, 0, common.config, true);
+ common.parse(0, 0, common.clientConfig, true);
+ options.parse(0, 0, common.clientConfig, true);
maxIOThreads = (options.maxIOThreads != -1) ?
options.maxIOThreads : 1;
}