Repository: jclouds Updated Branches: refs/heads/master ca70d4414 -> ab25fc725
putblob fails when file exists Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ab25fc72 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ab25fc72 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ab25fc72 Branch: refs/heads/master Commit: ab25fc7259ad620a4daa14c12a37cef498320ad5 Parents: ca70d44 Author: Zack Shoylev <[email protected]> Authored: Mon Nov 23 15:08:01 2015 -0600 Committer: Zack Shoylev <[email protected]> Committed: Mon Nov 23 16:01:46 2015 -0600 ---------------------------------------------------------------------- .../strategy/internal/FilesystemStorageStrategyImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/ab25fc72/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java ---------------------------------------------------------------------- diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index b47a642..02c176a 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -467,7 +467,13 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy { } payload.getContentMetadata().setContentMD5(actualHashCode); - tmpFile.renameTo(outputFile); + if (outputFile.exists()) { + delete(outputFile); + } + + if (!tmpFile.renameTo(outputFile)) { + throw new RuntimeException("Could not rename file " + tmpFile + " to " + outputFile); + } UserDefinedFileAttributeView view = getUserDefinedFileAttributeView(outputPath); if (view != null) {
