X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FBackupFiles.java;h=c41bd36619094027bd84ff102ae1d285545ab1c8;hb=4f1c8f3fdd352d5e6c3e6cfe1b729f9ef7d6e47f;hp=4f86f3db665dc71a4f9aff79f25239c7058b6c2a;hpb=5a49c58458ec048a993a5bd3e81432cd286e16f5;p=jalview.git

diff --git a/src/jalview/io/BackupFiles.java b/src/jalview/io/BackupFiles.java
index 4f86f3d..c41bd36 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");