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

* Move initScriptingEngine() and scriptingEngine.updatePrototypes() call inside try statement

Browse source 
* Replace do.. while with wile statement
This commit is contained in:
hns 2005-03-23 12:28:26 +00:00
parent 14f8f1e8d2
commit 4f59be6597
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,11 +121,9 @@ public final class RequestEvaluator implements Runnable {
Transactor localrtx = (Transactor) Thread.currentThread(); Transactor localrtx = (Transactor) Thread.currentThread();
try { try {
do { // while (localrtx == rtx);
// initialize scripting engine, in case it hasn't been initialized yet // while this thread is serving requests
initScriptingEngine(); while (localrtx == rtx) {
// update scripting prototypes
scriptingEngine.updatePrototypes();
// root object reference // root object reference
Object root; Object root;
@ -145,6 +143,11 @@ public final class RequestEvaluator implements Runnable {
try { try {
// initialize scripting engine
initScriptingEngine();
// update scripting prototypes
scriptingEngine.updatePrototypes();
// Transaction name is used for logging etc. // Transaction name is used for logging etc.
StringBuffer txname = new StringBuffer(app.getName()); StringBuffer txname = new StringBuffer(app.getName());
txname.append(":").append(req.getMethod().toLowerCase()).append(":"); txname.append(":").append(req.getMethod().toLowerCase()).append(":");
@ -516,8 +519,8 @@ public final class RequestEvaluator implements Runnable {
app.errorCount += 1; app.errorCount += 1;
app.logError("Error in " + Thread.currentThread(), x); app.logError("Error in " + Thread.currentThread(), x);
// Dump the profiling data to System.err // Dump stack trace to System.err in debug mode
if (app.debug && !(x instanceof ScriptingException)) { if (app.debug) {
x.printStackTrace(); x.printStackTrace();
} }
@ -545,7 +548,7 @@ public final class RequestEvaluator implements Runnable {
notifyAndWait(); notifyAndWait();
} while (localrtx == rtx); }
} finally { } finally {
localrtx.closeConnections(); localrtx.closeConnections();