Author: chug
Date: Tue Oct 30 17:40:21 2012
New Revision: 1403797
URL: http://svn.apache.org/viewvc?rev=1403797&view=rev
Log:
QPID-4404 C++ Broker qpidd hang with --config <directory>
Peeking at the conf sets the error flag and prevents the hang.
Modified:
qpid/trunk/qpid/cpp/src/qpid/Options.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/Options.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Options.cpp?rev=1403797&r1=1403796&r2=1403797&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Options.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/Options.cpp Tue Oct 30 17:40:21 2012
@@ -150,6 +150,7 @@ void Options::parse(int argc, char const
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
