Fix for windows

scalapb · Jan 20, 2024 · d2f26a4 · d2f26a4
1 parent 92138f5
commit d2f26a4
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/bridge/src/main/scala/protocbridge/FileCache.scala b/bridge/src/main/scala/protocbridge/FileCache.scala
@@ -7,7 +7,7 @@ import scala.concurrent.Promise
 import java.io.File
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.Try
-import java.nio.file.{Files, Path, StandardCopyOption}
+import java.nio.file.{AccessDeniedException, Files, Path, StandardCopyOption}
 
 /** Cache for files that performs a single concurrent get per key upon miss. */
 final class FileCache[K](
@@ -50,12 +50,22 @@ final class FileCache[K](
     val dstPath = dst.toPath()
     Files.copy(src.toPath(), tmp.toPath(), StandardCopyOption.REPLACE_EXISTING)
     tmp.setExecutable(true)
-    Files.move(
-      tmp.toPath(),
-      dstPath,
-      StandardCopyOption.ATOMIC_MOVE,
-      StandardCopyOption.REPLACE_EXISTING
-    )
+    try {
+      Files.move(
+        tmp.toPath(),
+        dstPath,
+        StandardCopyOption.ATOMIC_MOVE,
+        StandardCopyOption.REPLACE_EXISTING
+      )
+    } catch {
+      case e: AccessDeniedException =>
+        // On Windows sometimes atomic moves are impossible...
+        Files.move(
+          tmp.toPath(),
+          dstPath,
+          StandardCopyOption.REPLACE_EXISTING
+        )
+    }
     dst
   }