Tweak

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.0@4190 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/filed/heartbeat.c b/bacula/src/filed/heartbeat.c
index 9eaea9349a598ba4cc82f1829af052d5b00f4b94..32496e7a8e07d861d9d92a4fc79a7f700f9127b2 100644 (file)
--- a/bacula/src/filed/heartbeat.c
+++ b/bacula/src/filed/heartbeat.c
@@ -127,8 +127,6 @@ void stop_heartbeat_monitor(JCR *jcr)
    while (jcr->hb_bsock == NULL && cnt++ < 200) {
       bmicrosleep(0, 50000);         /* wait for start */
    }
-   if (!jcr->hb_bsock) {
-   }
 
    if (jcr->hb_bsock) {
       jcr->hb_bsock->timed_out = 1;   /* set timed_out to terminate read */
@@ -138,6 +136,7 @@ void stop_heartbeat_monitor(JCR *jcr)
       jcr->hb_dir_bsock->timed_out = 1;   /* set timed_out to terminate read */
       jcr->hb_dir_bsock->terminated = 1;  /* set to terminate read */
    }
+   Dmsg0(100, "Send kill to heartbeat id\n");
    pthread_kill(jcr->heartbeat_id, TIMEOUT_SIGNAL);  /* make heartbeat thread go away */
    bmicrosleep(0, 50000);
    cnt = 0;

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index f9ddc5fa7e7ddf69019bf7939d298804ce224ab9..aaed23ba49791767a6320637cb193db863c2621f 100644 (file)
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -1,15 +1,7 @@
-/*
- *  Bacula File Daemon  restore.c Restorefiles.
- *
- *    Kern Sibbald, November MM
- *
- *   Version $Id$
- *
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -33,6 +25,14 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ *  Bacula File Daemon  restore.c Restorefiles.
+ *
+ *    Kern Sibbald, November MM
+ *
+ *   Version $Id$
+ *
+ */
 
 #include "bacula.h"
 #include "filed.h"