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

prevent possible file limit issue 

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

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

@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@ -91,6 +92,12 @@ public class DefaultFileLockManager
if ( current != null )
{
log.debug( "read lock file exist continue wait" );
// close RandomAccessFile!!!
RandomAccessFile raf = lock.getRandomAccessFile();
if (raf != null)
{
raf.close();
}
continue;
}
@ -168,14 +175,21 @@ public class DefaultFileLockManager
Lock current = lockFiles.get( file );
if ( current != null )
{
log.debug( "write lock file exist continue wait" );
continue;
}
try
{
if ( current != null )
{
log.debug( "write lock file exist continue wait" );
// close RandomAccessFile!!!
RandomAccessFile raf = lock.getRandomAccessFile();
if (raf != null)
{
raf.close();
}
continue;
}
createNewFileQuietly( file );
lock.openLock( true, timeout > 0 );
acquired = true;

4
archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/Lock.java
View File

@ -144,6 +144,10 @@ public class Lock
}
protected RandomAccessFile getRandomAccessFile()
{
return randomAccessFile;
}
private void closeQuietly( Closeable closeable )
{