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

Applied patch for https://issues.apache.org/jira/browse/AMQ-3301 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1326252 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2012-04-15 04:50:53 +00:00
parent 2f0ef2e670
commit 50d3e8e09a
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kahadb/src/main/java/org/apache/kahadb/util/LockFile.java
View File

@ -51,21 +51,25 @@ public class LockFile {
return; return;
} }
if( lockCounter>0 ) { if (lockCounter > 0) {
return; return;
} }
IOHelper.mkdirs(file.getParentFile()); IOHelper.mkdirs(file.getParentFile());
synchronized (LockFile.class) {
if (System.getProperty(getVmLockKey()) != null) { if (System.getProperty(getVmLockKey()) != null) {
throw new IOException("File '" + file + "' could not be locked as lock is already held for this jvm."); throw new IOException("File '" + file + "' could not be locked as lock is already held for this jvm.");
} }
System.setProperty(getVmLockKey(), new Date().toString());
}
try {
if (lock == null) { if (lock == null) {
readFile = new RandomAccessFile(file, "rw"); readFile = new RandomAccessFile(file, "rw");
IOException reason = null; IOException reason = null;
try { try {
lock = readFile.getChannel().tryLock(0, Math.max(1, readFile.getChannel().size()), false); lock = readFile.getChannel().tryLock(0, Math.max(1, readFile.getChannel().size()), false);
} catch (OverlappingFileLockException e) { } catch (OverlappingFileLockException e) {
reason = IOExceptionSupport.create("File '" + file + "' could not be locked.",e); reason = IOExceptionSupport.create("File '" + file + "' could not be locked.", e);
} catch (IOException ioe) { } catch (IOException ioe) {
reason = ioe; reason = ioe;
} }
@ -82,6 +86,13 @@ public class LockFile {
} }
} }
} finally {
synchronized (LockFile.class) {
if (lock == null) {
System.getProperties().remove(getVmLockKey());
}
}
}
} }
/** /**
@ -92,7 +103,7 @@ public class LockFile {
} }
lockCounter--; lockCounter--;
if( lockCounter!=0 ) { if (lockCounter != 0) {
return; return;
} }
@ -107,7 +118,7 @@ public class LockFile {
} }
closeReadFile(); closeReadFile();
if( deleteOnUnlock ) { if (deleteOnUnlock) {
file.delete(); file.delete();
} }
} }