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/16 23:35:11 UTC
svn commit: r1551386 -
/archiva/trunk/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
Author: olamy
Date: Mon Dec 16 22:35:10 2013
New Revision: 1551386
URL: http://svn.apache.org/r1551386
Log:
prevent possible NPE
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=1551386&r1=1551385&r2=1551386&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 Mon Dec 16 22:35:10 2013
@@ -102,7 +102,10 @@ public class DefaultFileLockManager
{
// can happen if an other thread has deleted the file
// close RandomAccessFile!!!
- closeQuietly( lock.getRandomAccessFile() );
+ if ( lock != null )
+ {
+ closeQuietly( lock.getRandomAccessFile() );
+ }
log.debug( "read Lock skip: {} try to create file", e.getMessage() );
createNewFileQuietly( file );
}
@@ -178,8 +181,10 @@ public class DefaultFileLockManager
{
// can happen if an other thread has deleted the file
// close RandomAccessFile!!!
- closeQuietly( lock.getRandomAccessFile() );
-
+ if ( lock != null )
+ {
+ closeQuietly( lock.getRandomAccessFile() );
+ }
log.debug( "write Lock skip: {} try to create file", e.getMessage() );
createNewFileQuietly( file );
}