Fix project lock in Windows

1 files changed, 8 insertions, 1 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectLock.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectLock.java
index a373763a361..695fbb687b2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectLock.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectLock.java
@@ -69,7 +69,6 @@ public class ProjectLock implements Startable {
   public void stop() {
     if (lockFile != null) {
       try {
-        Files.delete(lockFilePath);
         lockFile.release();
         lockFile = null;
       } catch (IOException e) {
@@ -92,10 +91,18 @@ public class ProjectLock implements Startable {
         LOG.error("Error closing file", e);
       }
     }
+    
+    try {
+      Files.delete(lockFilePath);
+    } catch (IOException e) {
+      //ignore, as an error happens if another process just started to acquire the same lock
+      LOG.debug("Couldn't delete lock file: " + lockFilePath.toString(), e);
+    }
   }
 
   @Override
   public void start() {
+    // nothing to do
   }
 
 }