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

* Pull ahead beginning of try statement for catching redirects in order to allow redirect()

Browse source 
calls in getChildElement().
* Add comments for try statements.
This commit is contained in:
hns 2005-12-19 14:51:20 +00:00
parent c00c2cae25
commit 86d4f5dc5d
1 changed files with 112 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,6 +123,7 @@ public final class RequestEvaluator implements Runnable {
// when it's time to quit because another thread took over.
Transactor localrtx = (Transactor) Thread.currentThread();
// spans whole execution loop - close connections in finally clause
try {
// while this thread is serving requests
@ -149,6 +150,7 @@ public final class RequestEvaluator implements Runnable {
while (!done && localrtx == rtx) {
currentElement = null;
// catch errors in path resolution and script execution
try {
// initialize scripting engine
@ -183,6 +185,9 @@ public final class RequestEvaluator implements Runnable {
session.message = null;
}
// catch redirect in path resolution or script execution
try {
// catch object not found in path resolution
try {
if (error != null) {
// there was an error in the previous loop, call error handler
@ -322,7 +327,7 @@ public final class RequestEvaluator implements Runnable {
// end of path resolution section
/////////////////////////////////////////////////////////////////////////////
// beginning of execution section
try {
// set the req.action property, cutting off the _action suffix
req.setAction(action.substring(0, action.lastIndexOf("_action")));