diff options
| author | Charles E. Rolke <chug@apache.org> | 2012-10-30 17:40:21 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2012-10-30 17:40:21 +0000 |
| commit | 5c0678e6dc9f4006b7d9ca5d0d41881d5b554b50 (patch) | |
| tree | 6b67786057a55383d911e2fda7ef027d2e994774 /qpid/cpp | |
| parent | baae1c60270e43cd4fbf781d505261902421de18 (diff) | |
| download | qpid-python-5c0678e6dc9f4006b7d9ca5d0d41881d5b554b50.tar.gz | |
QPID-4404 C++ Broker qpidd hang with --config <directory>
Peeking at the conf sets the error flag and prevents the hang.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1403797 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/Options.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/Options.cpp b/qpid/cpp/src/qpid/Options.cpp index 9813dda697..b96fc59dda 100644 --- a/qpid/cpp/src/qpid/Options.cpp +++ b/qpid/cpp/src/qpid/Options.cpp @@ -150,6 +150,7 @@ void Options::parse(int argc, char const* const* argv, const std::string& config if (!configFile.empty()) { parsing="configuration file "+configFile; ifstream conf(configFile.c_str()); + conf.peek(); if (conf.good()) { // Remove this hack when we get a stable version of boost that // can allow unregistered options in config files. |