Improved bug fix refs #10677
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-publishing/document-store-lib@161868 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
78c2c67252
commit
eecbbb1018
|
@ -101,9 +101,7 @@ public class FallbackMonitor implements Runnable {
|
||||||
|
|
||||||
Long timestamp = Calendar.getInstance().getTimeInMillis();
|
Long timestamp = Calendar.getInstance().getTimeInMillis();
|
||||||
File elaborationFile = fallbackPersistenceBackend.moveFallbackFile(ELABORATION_FILE_SUFFIX + "." + timestamp.toString());
|
File elaborationFile = fallbackPersistenceBackend.moveFallbackFile(ELABORATION_FILE_SUFFIX + "." + timestamp.toString());
|
||||||
|
|
||||||
elaborateFallbackFile(elaborationFile);
|
elaborateFallbackFile(elaborationFile);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -52,12 +52,16 @@ public class FallbackPersistenceBackend extends PersistenceBackend {
|
||||||
/**
|
/**
|
||||||
* Move the fallbackFile to a new file with the same name by appending a suffix
|
* Move the fallbackFile to a new file with the same name by appending a suffix
|
||||||
* @param suffix
|
* @param suffix
|
||||||
* @return the move file
|
* @return the moved file if any, null otherwise
|
||||||
*/
|
*/
|
||||||
protected File moveFallbackFile(String suffix) {
|
protected File moveFallbackFile(String suffix) {
|
||||||
synchronized(fallbackFile) {
|
synchronized(fallbackFile) {
|
||||||
try {
|
try {
|
||||||
Path source = fallbackFile.toPath();
|
Path source = fallbackFile.toPath();
|
||||||
|
if(!fallbackFile.exists()) {
|
||||||
|
logger.trace("No fallback file {} found. Nothing to recover", source.toAbsolutePath().toString());
|
||||||
|
return null;
|
||||||
|
}
|
||||||
Path target = source.resolveSibling(fallbackFile.getName()+suffix);
|
Path target = source.resolveSibling(fallbackFile.getName()+suffix);
|
||||||
logger.trace("Going to move fallback file {} to {}", source.toAbsolutePath().toString(), target.toAbsolutePath().toString());
|
logger.trace("Going to move fallback file {} to {}", source.toAbsolutePath().toString(), target.toAbsolutePath().toString());
|
||||||
target = Files.move(source, source.resolveSibling(fallbackFile.getName()+suffix), StandardCopyOption.ATOMIC_MOVE);
|
target = Files.move(source, source.resolveSibling(fallbackFile.getName()+suffix), StandardCopyOption.ATOMIC_MOVE);
|
||||||
|
|
Loading…
Reference in New Issue