From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 2 Dec 2008 17:40:15 +0000 (+0000)
Subject: ebl  Apply 2.4.3-prune-deadlock.patch that fixes a problem when
X-Git-Tag: Release-3.0.0~529
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4b7910887964e9be4b02f3c782062b009fe15ee5;p=bacula%2Fbacula

ebl  Apply 2.4.3-prune-deadlock.patch that fixes a problem when
     using Catalog as message backend.



git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8102 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index 05a94d2128..e1209b2983 100644
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -499,7 +499,6 @@ void free_jcr(JCR *jcr)
 
 #endif
 
-   dequeue_messages(jcr);
    lock_jcr_chain();
    jcr->dec_use_count();              /* decrement use count */
    if (jcr->use_count() < 0) {
@@ -520,6 +519,7 @@ void free_jcr(JCR *jcr)
    }
    remove_jcr(jcr);                   /* remove Jcr from chain */
 
+   dequeue_messages(jcr);
    job_end_pop(jcr);                  /* pop and call hooked routines */
 
    Dmsg1(dbglvl, "End job=%d\n", jcr->JobId);
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 9b4c7ee4e6..dd68d2b234 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -10,6 +10,9 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+02Dec08
+ebl  Apply 2.4.3-prune-deadlock.patch that fixes a problem when
+     using Catalog as message backend.
 01Dec08
 kes  Apply Marco's Darwin xattr patches.
 28Nov08