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

Call abort() on the scriptingEngine to let it know that the current

Browse source 
execution is being aborted.
This commit is contained in:
hns 2002-09-04 14:01:29 +00:00
parent 495495da18
commit 5b0d8935e8
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/helma/framework/core/RequestEvaluator.java
View file

@ -599,7 +599,9 @@ public final class RequestEvaluator implements Runnable {
public synchronized void stopThread () { public synchronized void stopThread () {
app.logEvent ("Stopping Thread "+rtx); app.logEvent ("Stopping Thread "+rtx);
Transactor t = rtx; Transactor t = rtx;
// evaluator.thread = null; // let the scripting engine know that the
// current transaction is being aborted.
scriptingEngine.abort ();
rtx = null; rtx = null;
if (t != null) { if (t != null) {
if (reqtype != NONE) { if (reqtype != NONE) {
@ -608,8 +610,6 @@ public final class RequestEvaluator implements Runnable {
try { try {
t.abort (); t.abort ();
} catch (Exception ignore) {} } catch (Exception ignore) {}
// FIXME: do not call deprecated method stop() on threads -
// do we need a substitute for it?
} else { } else {
notifyAll (); notifyAll ();
} }
@ -625,7 +625,6 @@ public final class RequestEvaluator implements Runnable {
if (rtx == null || !rtx.isAlive()) { if (rtx == null || !rtx.isAlive()) {
// app.logEvent ("Starting Thread"); // app.logEvent ("Starting Thread");
rtx = new Transactor (this, app.threadgroup, app.nmgr); rtx = new Transactor (this, app.threadgroup, app.nmgr);
// evaluator.thread = rtx;
rtx.start (); rtx.start ();
} else { } else {
notifyAll (); notifyAll ();