summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-05-08 18:19:30 +0000
committerAlan Conway <aconway@apache.org>2007-05-08 18:19:30 +0000
commit6e8354720d6f9103128376492029e2cbdb729490 (patch)
tree506fccceab0e5b0b489cf367a12a3b78581fb8d1 /cpp/src
parent3396c24635dd2dc387bcb23196f241a1d6b8a35f (diff)
downloadqpid-python-6e8354720d6f9103128376492029e2cbdb729490.tar.gz
Recorded merge of revisions 536279 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r536279 | aconway | 2007-05-08 14:09:35 -0400 (Tue, 08 May 2007) | 3 lines * lib/broker/Daemon.cpp: Fixed bug causing qpidd -c to sometmes delete the pidfile. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@536285 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/Daemon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/Daemon.cpp b/cpp/src/qpid/broker/Daemon.cpp
index 729718b9d1..3c5a642b60 100644
--- a/cpp/src/qpid/broker/Daemon.cpp
+++ b/cpp/src/qpid/broker/Daemon.cpp
@@ -51,7 +51,7 @@ const char* Daemon::getPidFile() {
return pidFile.c_str();
}
-Daemon::Daemon(const string& name_, int secs) : timeout(secs)
+Daemon::Daemon(const string& name_, int secs) : pid(-1), timeout(secs)
{
name = name_;
daemon_pid_file_ident = daemon_log_ident = name.c_str();