diff options
| author | Alan Conway <aconway@apache.org> | 2007-05-08 18:19:30 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-05-08 18:19:30 +0000 |
| commit | d7185d6682506bb1829f233884bc5ecf5d26b0d5 (patch) | |
| tree | 4b83105a8184f4e4948ca48219b472b2e8e49627 /qpid/cpp | |
| parent | eaf3e6ce46ac764666dc030b17beed644e4fb44c (diff) | |
| download | qpid-python-d7185d6682506bb1829f233884bc5ecf5d26b0d5.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@536285 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Daemon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/Daemon.cpp b/qpid/cpp/src/qpid/broker/Daemon.cpp index 729718b9d1..3c5a642b60 100644 --- a/qpid/cpp/src/qpid/broker/Daemon.cpp +++ b/qpid/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(); |