antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

doesnt use thead.stop() anymore

Browse source
This commit is contained in:
hns 2001-01-25 20:57:30 +00:00
parent d807e4a340
commit 857544fd9b
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/helma/objectmodel/db/Transactor.java
View file

@ -194,10 +194,12 @@ public class Transactor extends Thread {
if (active) {
active = false;
nmgr.db.abortTransaction (txn);
txn = null;
if (txn != null) {
nmgr.db.abortTransaction (txn);
txn = null;
}
IServer.getLogger().log (tname+" aborted after "+(System.currentTimeMillis()-tstart)+" millis");
}
IServer.getLogger().log (tname+" aborted after "+(System.currentTimeMillis()-tstart)+" millis");
}
public synchronized void kill () {
@ -206,22 +208,15 @@ public class Transactor extends Thread {
// evaluator, so we can hope that it stops without doing anything else.
try {
join (500);
} catch (InterruptedException ir) {
Thread.currentThread().interrupt();
}
} catch (InterruptedException ir) {}
// Interrupt the thread if it has not noticed the flag (e.g. because it is busy
// reading from a network socket).
if (isAlive()) {
interrupt ();
try {
join (3000);
} catch (InterruptedException ignore) {
Thread.currentThread().interrupt();
}
if (isAlive())
// Sorry to be so rude...
stop (new TimeoutException());
join (1000);
} catch (InterruptedException ir) {}
}
}