Fix NULL Volume error when reading (or Migration or VBackup) must switch

     drives when no tape is mounted.

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

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 5345ca35eb60d28b3ceeed15688758cb5311ea47..89a0b7b0addfbb274bc6b66fc41c215cbeacfc44 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -430,11 +430,14 @@ bool release_device(DCR *dcr)
    dcr->clear_reserved();
 
    if (dev->can_read()) {
+      VOLUME_CAT_INFO *vol = &dev->VolCatInfo;
       dev->clear_read();              /* clear read bit */
-      Dmsg0(100, "dir_update_vol_info. Release0\n");
-      dir_update_volume_info(dcr, false, false); /* send Volume info to Director */
-      volume_unused(dcr);
-
+      Dmsg2(000, "dir_update_vol_info. label=%d Vol=%s\n",
+         dev->is_labeled(), vol->VolCatName);
+      if (dev->is_labeled() && vol->VolCatName[0] != 0) {
+         dir_update_volume_info(dcr, false, false); /* send Volume info to Director */
+         volume_unused(dcr);
+      }
    } else if (dev->num_writers > 0) {
       /* 
        * Note if WEOT is set, we are at the end of the tape

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 24c02cccde254a697c170fd37b2a50d64f46a06e..8c26f18b7571e97b3cd862d639cc4f0a2a26563f 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.5.3"
-#define BDATE   "12 Aug 2008"
-#define LSMDATE "12Aug08"
+#define BDATE   "21 Aug 2008"
+#define LSMDATE "21Aug08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index f65aefbd12b8bdbec21a508c36f1045afec53317..5883c75d538c193a990620cae8f63f237ebcdb48 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -32,6 +32,9 @@ separator in console (!$%&'()*+,-/:;<>?[]^`{|}~)
 
 
 General:
+21Aug08
+kes  Fix NULL Volume error when reading (or Migration or VBackup) must switch
+     drives when no tape is mounted.
 18Aug08
 kes  Add additional info to some SD messages.
 kes  Add fix supplied by Martin Simmons for turning off EOL character