From: Eric Bollengier <eric@baculasystems.com>
Date: Tue, 28 Nov 2017 09:19:39 +0000 (+0100)
Subject: Remove tests about "NULL Volume name. This shouldn't happen!!!*
X-Git-Tag: Release-9.2.0~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7458d67fe39b3d699b5676663ea8d496f810eba2;p=thirdparty%2Fbacula.git

Remove tests about "NULL Volume name. This shouldn't happen!!!*

The device structure should not be accessed when it's not locked. Other jobs
can fill up the volume and change the volume when we start. Low level function
will ensure that everything is properly locked and that a volume is loaded.
---

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index db2cc1e190..144436ff28 100644
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -102,20 +102,11 @@ bool do_append_data(JCR *jcr)
    dev->start_of_job(dcr);
    jcr->sendJobStatus(JS_Running);
 
-   ASSERTD(dev->VolCatInfo.VolCatName[0], "NULL Volume name. This shouldn't happen!!!\n");
-   if (dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
-   }
    Dmsg1(50, "Begin append device=%s\n", dev->print_name());
 
    begin_data_spool(dcr);
    begin_attribute_spool(jcr);
 
-   Dmsg0(100, "Just after acquire_device_for_append\n");
-   ASSERTD(dev->VolCatInfo.VolCatName[0], "NULL Volume name. This shouldn't happen!!!\n");
-   if (dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
-   }
    /*
     * Write Begin Session Record
     */
@@ -126,11 +117,6 @@ bool do_append_data(JCR *jcr)
       ok = false;
    }
 
-   ASSERTD(dev->VolCatInfo.VolCatName[0], "NULL Volume name. This shouldn't happen!!!\n");
-   if (dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
-   }
-
    /* Tell File daemon to send data */
    if (!fd->fsend(OK_data)) {
       berrno be;