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

* Null out scriptingEngine if initScriptingEngine() fails.

Browse source 
* Make sure we cause no uncaught exceptions in request evaluator loop,
  will cause helma to hang.
* Make initScriptingEngine() synchronized.
This commit is contained in:
hns 2006-12-15 15:10:34 +00:00
parent 4f7765259a
commit 2ec32f146a
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,7 @@ public final class RequestEvaluator implements Runnable {
this.app = app; this.app = app;
} }
protected void initScriptingEngine() { protected synchronized void initScriptingEngine() {
if (scriptingEngine == null) { if (scriptingEngine == null) {
String engineClassName = app.getProperty("scriptingEngine", String engineClassName = app.getProperty("scriptingEngine",
"helma.scripting.rhino.RhinoEngine"); "helma.scripting.rhino.RhinoEngine");
@ -108,6 +108,8 @@ public final class RequestEvaluator implements Runnable {
app.logEvent("******************************************"); app.logEvent("******************************************");
app.logError("Error creating scripting engine", t); app.logError("Error creating scripting engine", t);
// null out invalid scriptingEngine
scriptingEngine = null;
// rethrow exception // rethrow exception
if (t instanceof RuntimeException) { if (t instanceof RuntimeException) {
throw((RuntimeException) t); throw((RuntimeException) t);
@ -566,12 +568,12 @@ public final class RequestEvaluator implements Runnable {
} }
// exit execution context // exit execution context
scriptingEngine.exitContext(); if (scriptingEngine != null)
scriptingEngine.exitContext();
notifyAndWait(); notifyAndWait();
} }
} finally { } finally {
localrtx.closeConnections(); localrtx.closeConnections();
} }