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

JumpMind · Jul 9, 2020 · 03d6283 · 03d6283
2 parents 293879d + 57882a0
commit 03d6283
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 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,7 +33,6 @@
 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;
@@ -169,10 +168,7 @@ public void setState(State state) {
                     }
                 }
 
-                try {
-                    Files.move(file.toPath(), newFile.toPath());
-                } catch(IOException e) {
-                    log.error(e.getMessage(),e);
+                if (!file.renameTo(newFile)) {
                     handleFailedRename(file, newFile);
                 }
             }

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagingManager.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagingManager.java
@@ -225,10 +225,9 @@ public IStagedResource find(String path) {
             boolean foundResourcePath = resourcePathsCache.containsKey(path);
             if (!foundResourcePath) {
                 synchronized (this) {
-                    IStagedResource staged = createStagedResource(path);
-                    if (staged.getState() == State.DONE) {
+                    resource = createStagedResource(path);
+                    if (resource.getState() == State.DONE) {
                         resourcePathsCache.put(path, path);
-                        resource = staged;
                         foundResourcePath = true;
                     }
                 }