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 | 05952199a01eb9e7f8128e6cb0663a888b51ead3 (patch) | |
| tree | 9dd31375095224eba9a18ea4dcf3bc094c064431 /cpp/src/qpid/Options.cpp | |
| parent | eed3a2372577d1b92f9d13321f2e5ece83754e92 (diff) | |
| download | qpid-python-05952199a01eb9e7f8128e6cb0663a888b51ead3.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/qpid@1403797 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/Options.cpp')
| -rw-r--r-- | cpp/src/qpid/Options.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/qpid/Options.cpp b/cpp/src/qpid/Options.cpp index 9813dda697..b96fc59dda 100644 --- a/cpp/src/qpid/Options.cpp +++ b/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. |