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

We can just use Lock.toString() to show lock file, no? 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@150326 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug Cutting 2004-05-11 17:43:28 +00:00
parent 8c43a92da9
commit 9ed56d3d04
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/lucene/store/FSDirectory.java
View File

@ -290,7 +290,7 @@ public final class FSDirectory extends Directory {
// create a lock file // create a lock file
final File lockFile = new File(lockDir, buf.toString()); final File lockFile = new File(lockDir, buf.toString());
return new Lock(lockFile.getAbsolutePath()) { return new Lock() {
public boolean obtain() throws IOException { public boolean obtain() throws IOException {
if (DISABLE_LOCKS) if (DISABLE_LOCKS)
return true; return true;

14
src/java/org/apache/lucene/store/Lock.java
View File

@ -35,15 +35,7 @@ import java.io.IOException;
*/ */
public abstract class Lock { public abstract class Lock {
public static long LOCK_POLL_INTERVAL = 1000; public static long LOCK_POLL_INTERVAL = 1000;
private String lockName = null;
public Lock(String lockName) {
this.lockName = lockName;
}
public Lock() {
}
/** Attempts to obtain exclusive access and immediately return /** Attempts to obtain exclusive access and immediately return
* upon success or failure. * upon success or failure.
* @return true iff exclusive access is obtained * @return true iff exclusive access is obtained
@ -63,11 +55,7 @@ public abstract class Lock {
int sleepCount = 0; int sleepCount = 0;
while (!locked) { while (!locked) {
if (++sleepCount == maxSleepCount) { if (++sleepCount == maxSleepCount) {
String s = "Lock obtain timed out"; throw new IOException("Lock obtain timed out: " + this.toString());
if (lockName != null) {
s += ", lock name =" + lockName;
}
throw new IOException(s);
} }
try { try {
Thread.sleep(LOCK_POLL_INTERVAL); Thread.sleep(LOCK_POLL_INTERVAL);