From 5c0678e6dc9f4006b7d9ca5d0d41881d5b554b50 Mon Sep 17 00:00:00 2001 From: "Charles E. Rolke" Date: Tue, 30 Oct 2012 17:40:21 +0000 Subject: QPID-4404 C++ Broker qpidd hang with --config 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 --- qpid/cpp/src/qpid/Options.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/cpp') 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. -- cgit v1.2.1