提交 75403d55 authored 作者: Thomas Mueller's avatar Thomas Mueller

Finalize was never called, because the thread references the object.

上级 bc55fb40
...@@ -20,7 +20,6 @@ import org.h2.test.TestBase; ...@@ -20,7 +20,6 @@ import org.h2.test.TestBase;
*/ */
public class TestFileLock extends TestBase implements Runnable { public class TestFileLock extends TestBase implements Runnable {
private static final int KILL = 5;
private static final String FILE = baseDir + "/test.lock"; private static final String FILE = baseDir + "/test.lock";
private static volatile int locks; private static volatile int locks;
private static volatile boolean stop; private static volatile boolean stop;
...@@ -89,8 +88,9 @@ public class TestFileLock extends TestBase implements Runnable { ...@@ -89,8 +88,9 @@ public class TestFileLock extends TestBase implements Runnable {
} }
public void run() { public void run() {
FileLock lock = null;
while (!stop) { while (!stop) {
FileLock lock = new FileLock(new TraceSystem(null, false), FILE, 100); lock = new FileLock(new TraceSystem(null, false), FILE, 100);
try { try {
lock.lock(allowSockets ? FileLock.LOCK_SOCKET : FileLock.LOCK_FILE); lock.lock(allowSockets ? FileLock.LOCK_SOCKET : FileLock.LOCK_FILE);
base.trace(lock + " locked"); base.trace(lock + " locked");
...@@ -101,14 +101,8 @@ public class TestFileLock extends TestBase implements Runnable { ...@@ -101,14 +101,8 @@ public class TestFileLock extends TestBase implements Runnable {
} }
Thread.sleep(wait + (int) (Math.random() * wait)); Thread.sleep(wait + (int) (Math.random() * wait));
locks--; locks--;
if ((Math.random() * 50) < KILL) {
base.trace(lock + " kill");
lock = null;
System.gc();
} else {
base.trace(lock + " unlock"); base.trace(lock + " unlock");
lock.unlock(); lock.unlock();
}
if (locks < 0) { if (locks < 0) {
System.err.println("ERROR! LOCKS=" + locks); System.err.println("ERROR! LOCKS=" + locks);
stop = true; stop = true;
...@@ -122,6 +116,9 @@ public class TestFileLock extends TestBase implements Runnable { ...@@ -122,6 +116,9 @@ public class TestFileLock extends TestBase implements Runnable {
// ignore // ignore
} }
} }
if (lock != null) {
lock.unlock();
}
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论