Merge remote-tracking branch 'origin/3.10' into 3.11

JumpMind · Jun 29, 2020 · 7725a58 · 7725a58
2 parents 0b3fa94 + c500a3c
commit 7725a58
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagedResource.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagedResource.java
@@ -33,6 +33,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.StringReader;
+import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.Map;
@@ -168,9 +169,12 @@ public void setState(State state) {
                     }
                 }
 
-                if (!file.renameTo(newFile)) {
+                try {
+                    Files.move(file.toPath(), newFile.toPath());
+                } catch(IOException e) {
+                    log.error(e.getMessage(),e);
                     handleFailedRename(file, newFile);
-                }  
+                }
             }
         }