Fix reload algorithm + reload orphaned buffer + term_wait destruction

[bacula/bacula] / bacula / src / dird / job.c

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index de336b01af3a09741ee7ed58ab46e5fc90173922..19a0faf38c84a6f54b01d356c3278f9654ccfe1e 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -98,6 +98,7 @@ void run_job(JCR *jcr)
       Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
       goto bail_out;
    }
+   jcr->term_wait_inited = true;
 
    /*
     * Open database
@@ -654,7 +655,10 @@ void dird_free_jcr(JCR *jcr)
       free_pool_memory(jcr->client_uname);
       jcr->client_uname = NULL;
    }
-   pthread_cond_destroy(&jcr->term_wait);
+   if (jcr->term_wait_inited) {
+      pthread_cond_destroy(&jcr->term_wait);
+   }
+   jcr->job_end_push.destroy();
    Dmsg0(200, "End dird free_jcr\n");
 }