From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 6 Jul 2020 14:43:37 +0000 (+0100)
Subject: JAL-3628 Fix for slightly incorrect boolean usage to determine success when rolling... 
X-Git-Tag: Develop-2_11_2_0-d20201215~15^2~33
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=f0b9fa07ba20d9227fefc174e3fdf6abb0e0b288;p=jalview.git

JAL-3628 Fix for slightly incorrect boolean usage to determine success when rolling backup files
---

diff --git a/src/jalview/io/BackupFiles.java b/src/jalview/io/BackupFiles.java
index 5594857..11d1a16 100644
--- a/src/jalview/io/BackupFiles.java
+++ b/src/jalview/io/BackupFiles.java
@@ -431,7 +431,9 @@ public class BackupFiles
           {
             if (previousFile != null)
             {
-              ret = ret && moveFileToFile(backupfile_n, previousFile);
+              // using boolean '&' instead of '&&' as don't want moveFileToFile
+              // attempt to be conditional (short-circuit)
+              ret = ret & moveFileToFile(backupfile_n, previousFile);
             }
           }
 
@@ -549,7 +551,9 @@ public class BackupFiles
                     suffix, digits);
     Cache.log.debug("BACKUPFILES Moving old file [" + file
             + "] to latestBackupFilename [" + latestBackupFilename + "]");
-    ret |= moveFileToFile(file, new File(latestBackupFilename));
+    // using boolean '&' instead of '&&' as don't want moveFileToFile attempt to
+    // be conditional (short-circuit)
+    ret = ret & moveFileToFile(file, new File(latestBackupFilename));
     Cache.log.debug(
             "BACKUPFILES moving " + file + " to " + latestBackupFilename
                     + " was " + (ret ? "" : "NOT ") + "successful");