Don't close_db() in free_ua_context() and don't zap jcr pointer to db

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

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index acdf92a3b9349e901fe63a8f618a412d9bd3a1ee..2e05678084b3203e1d86f3739bc2f306079a461c 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -1563,5 +1563,4 @@ void close_db(UAContext *ua)
       db_close_database(ua->jcr, ua->db);
    }
    ua->db = NULL;
-   ua->jcr->db = NULL;
 }

diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c
index 54f4801ed52ff9294d071ba17da9a7d0f927aad2..eb5470c0f13768b76cd05ef1c838a82b33888aee 100644 (file)
--- a/bacula/src/dird/ua_server.c
+++ b/bacula/src/dird/ua_server.c
@@ -176,6 +176,7 @@ static void *handle_UA_client_request(void *arg)
 
 getout:
 
+   close_db(ua);
    free_ua_context(ua);
    free_jcr(jcr);
 
@@ -220,8 +221,6 @@ void free_ua_context(UAContext *ua)
       bnet_close(ua->UA_sock);
    }
 
-   close_db(ua);
-
    free(ua);
 }