You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/12/18 05:04:39 UTC
svn commit: r1551831 -
/archiva/trunk/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
Author: olamy
Date: Wed Dec 18 04:04:38 2013
New Revision: 1551831
URL: http://svn.apache.org/r1551831
Log:
ignore ClosedChannelException
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java?rev=1551831&r1=1551830&r2=1551831&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java Wed Dec 18 04:04:38 2013
@@ -28,6 +28,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
+import java.nio.channels.ClosedChannelException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -35,7 +36,7 @@ import java.util.concurrent.ConcurrentMa
* @author Olivier Lamy
* @since 2.0.0
*/
-@Service( "fileLockManager#default" )
+@Service("fileLockManager#default")
public class DefaultFileLockManager
implements FileLockManager
{
@@ -256,6 +257,11 @@ public class DefaultFileLockManager
lockFiles.remove( lock.getFile() );
lock.close();
}
+ catch ( ClosedChannelException e )
+ {
+ // skip this one
+ log.debug( "ignore ClosedChannelException: {}", e.getMessage() );
+ }
catch ( IOException e )
{
throw new FileLockException( e.getMessage(), e );