git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3628 Fix for slightly incorrect boolean usage to determine success when rolling...
[jalview.git]
/
src
/
jalview
/
io
/
BackupFiles.java
diff --git
a/src/jalview/io/BackupFiles.java
b/src/jalview/io/BackupFiles.java
index
4f86f3d
..
c41bd36
100644
(file)
--- a/
src/jalview/io/BackupFiles.java
+++ b/
src/jalview/io/BackupFiles.java
@@
-431,7
+431,9
@@
public class BackupFiles
{
if (previousFile != null)
{
{
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 + "]");
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");
Cache.log.debug(
"BACKUPFILES moving " + file + " to " + latestBackupFilename
+ " was " + (ret ? "" : "NOT ") + "successful");