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

* Make usage of deprecated Thread.stop() dependent on setting of

Browse source 
requestTimeoutStop = true|false app property
This commit is contained in:
hns 2006-05-11 19:22:07 +00:00
parent 5c1714d855
commit 676f4a06f0
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/helma/scripting/rhino/RhinoEngine.java
View file

@ -386,14 +386,16 @@ public class RhinoEngine implements ScriptingEngine {
Thread t = thread;
if (t != null && t.isAlive()) {
t.interrupt();
try {
Thread.sleep(5000);
if (t.isAlive()) {
// thread is still running, gotta stop it.
t.stop();
if ("true".equals(app.getProperty("requestTimeoutStop", "true"))) {
try {
Thread.sleep(5000);
if (t.isAlive()) {
// thread is still running, gotta stop it.
t.stop();
}
} catch (InterruptedException i) {
// interrupted, ignore
}
} catch (InterruptedException i) {
// interrupted, ignore
}
}
}