You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/05/08 20:19:31 UTC
svn commit: r536285 - in /incubator/qpid/trunk/qpid: ./
cpp/src/qpid/broker/Daemon.cpp
Author: aconway
Date: Tue May 8 11:19:30 2007
New Revision: 536285
URL: http://svn.apache.org/viewvc?view=rev&rev=536285
Log:
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.
........
Modified:
incubator/qpid/trunk/qpid/ (props changed)
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp
Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp?view=diff&rev=536285&r1=536284&r2=536285
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp Tue May 8 11:19:30 2007
@@ -51,7 +51,7 @@
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();