track FileNotFoundException if a concurrent thread delete the file before locking and try recreate it

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1550647 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 31 insertions, 2 deletions

diff --git a/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java b/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
index e25626f0a..feadc96f4 100644
--- a/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
+++ b/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
@@ -94,10 +94,15 @@ public class DefaultFileLockManager
 
                 try
                 {
-                    file.createNewFile();
                     lock.openLock( false, timeout > 0 );
                     acquired = true;
                 }
+                catch ( FileNotFoundException e )
+                {
+                    // can happen if an other thread has deleted the file
+                    log.debug( "read Lock skip: {} try to create file", e.getMessage() );
+                    createNewFileQuietly( file );
+                }
                 catch ( IOException e )
                 {
                     throw new FileLockException( e.getMessage(), e );
@@ -169,6 +174,12 @@ public class DefaultFileLockManager
                     lock.openLock( true, timeout > 0 );
                     acquired = true;
                 }
+                catch ( FileNotFoundException e )
+                {
+                    // can happen if an other thread has deleted the file
+                    log.debug( "write Lock skip: {} try to create file", e.getMessage() );
+                    createNewFileQuietly( file );
+                }
                 catch ( IOException e )
                 {
                     throw new FileLockException( e.getMessage(), e );
@@ -187,13 +198,31 @@ public class DefaultFileLockManager
 
             return lock;
         }
-        catch ( FileNotFoundException e )
+
+        catch (
+
+            FileNotFoundException e
+
+            )
+
         {
             throw new FileLockException( e.getMessage(), e );
         }
 
     }
 
+    private void createNewFileQuietly( File file )
+    {
+        try
+        {
+            file.createNewFile();
+        }
+        catch ( IOException e )
+        {
+            // skip that
+        }
+    }
+
     @Override
     public void release( Lock lock )
         throws FileLockException