Add temporary fix to avoid a deadlock after a reload command on an incorrect configur...

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 44a7dc1e4022540bbb90c38b991741a2f81ec1e1..cfb838860975c341b0084ab72e7a584517b88444 100644 (file)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -834,10 +834,18 @@ void dispatch_message(JCR *jcr, int type, utime_t mtime, char *msg)
     if (!jcr) {
        jcr = get_jcr_from_tsd();
     }
     if (!jcr) {
        jcr = get_jcr_from_tsd();
     }

+
+/* Temporary fix for a deadlock in the reload command when
+ * the configuration has a problem. The JCR chain is locked
+ * during the reload, we cannot create a new JCR.
+ */
+#if 0

     if (!jcr) {
        jcr = new_jcr(sizeof(JCR), NULL);
        created_jcr = true;
     }
     if (!jcr) {
        jcr = new_jcr(sizeof(JCR), NULL);
        created_jcr = true;
     }

+#endif
+

     if (jcr) {
        msgs = jcr->jcr_msgs;
     }
     if (jcr) {
        msgs = jcr->jcr_msgs;
     }