[Bacula-commits] git: Bacula branch, Branch-5.0, updated. d5f6bfa533a2dd252174a008cfc963dae43b1873

[Marco v. W. <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula".

The branch, Branch-5.0 has been updated
       via  d5f6bfa533a2dd252174a008cfc963dae43b1873 (commit)
       via  40ab07673d7dbafac57deda37c5f1483d8cfcf87 (commit)
      from  60a83f1a2ff60e468ab5fd2ac07111f0c16c2bab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d5f6bfa533a2dd252174a008cfc963dae43b1873
Merge: 40ab07673d7dbafac57deda37c5f1483d8cfcf87 60a83f1a2ff60e468ab5fd2ac07111f0c16c2bab
Author: Marco van Wieringen <mv...@pl...>
Date:   Sat Mar 27 23:03:41 2010 +0100

    Merge branch 'Branch-5.0' of ssh://ma...@ba.../gitroot/bacula/bacula into Branch-5.0

commit 40ab07673d7dbafac57deda37c5f1483d8cfcf87
Author: Marco van Wieringen <mv...@pl...>
Date:   Sat Mar 27 23:02:17 2010 +0100

    Fix database locking calling db_lock and returning from function without calling db_unlock.

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/src/cats/sql_list.c b/bacula/src/cats/sql_list.c
index 6c005ca..aa903a0 100644
--- a/bacula/src/cats/sql_list.c
+++ b/bacula/src/cats/sql_list.c
@@ -291,10 +291,11 @@ void db_list_joblog_records(JCR *jcr, B_DB *mdb, uint32_t JobId,
                               DB_LIST_HANDLER *sendit, void *ctx, e_list_type type)
 {
    char ed1[50];
-   db_lock(mdb);
+
    if (JobId <= 0) {
       return;
    }
+   db_lock(mdb);
    if (type == VERT_LIST) {
       Mmsg(mdb->cmd, "SELECT Time,LogText FROM Log "
            "WHERE Log.JobId=%s", edit_int64(JobId, ed1));


hooks/post-receive
-- 
Bacula