Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prevent possible race condition if the file has been deleted 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1551109 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-12-16 03:35:55 +00:00
parent 6fee2f195f
commit 4e077a844e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
View File

@ -65,7 +65,7 @@ public class DefaultFileLockManager
try try
{ {
Lock lock = new Lock( file, false ); Lock lock = null;
stopWatch.start(); stopWatch.start();
@ -84,6 +84,8 @@ public class DefaultFileLockManager
} }
} }
lock = new Lock( file, false );
Lock current = lockFiles.get( file ); Lock current = lockFiles.get( file );
if ( current != null ) if ( current != null )
@ -143,12 +145,13 @@ public class DefaultFileLockManager
try try
{ {
Lock lock = new Lock( file, true ); Lock lock = null;
stopWatch.start(); stopWatch.start();
while ( !acquired ) while ( !acquired )
{ {
if ( timeout > 0 ) if ( timeout > 0 )
{ {
long delta = stopWatch.getTime(); long delta = stopWatch.getTime();
@ -161,6 +164,8 @@ public class DefaultFileLockManager
} }
} }
lock = new Lock( file, true );
Lock current = lockFiles.get( file ); Lock current = lockFiles.get( file );
if ( current != null ) if ( current != null )