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

° Cut off _action suffix when setting the action property the reqest object

Browse source 
° Unset done flag when processing an error to make sure it is actually processed
This commit is contained in:
hns 2002-02-22 16:26:04 +00:00
parent 8bab32a94c
commit 3fee354352
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,8 +344,8 @@ public class RequestEvaluator implements Runnable {
try { try {
localrtx.timer.beginEvent (requestPath+" execute"); localrtx.timer.beginEvent (requestPath+" execute");
// set the req.action property // set the req.action property, cutting off the _action suffix
req.action = action; req.action = action.substring (0, action.length()-7);
// try calling onRequest() function on object before // try calling onRequest() function on object before
// calling the actual action // calling the actual action
try { try {
@ -407,6 +407,8 @@ public class RequestEvaluator implements Runnable {
abortTransaction (false); abortTransaction (false);
if (error == null) { if (error == null) {
app.errorCount += 1; app.errorCount += 1;
// set done to false so that the error will be processed
done = false;
error = "Couldn't complete transaction due to heavy object traffic (tried "+tries+" times)"; error = "Couldn't complete transaction due to heavy object traffic (tried "+tries+" times)";
} else { } else {
// error in error action. use traditional minimal error message // error in error action. use traditional minimal error message
@ -434,6 +436,8 @@ public class RequestEvaluator implements Runnable {
res.reset (); res.reset ();
if (error == null) { if (error == null) {
app.errorCount += 1; app.errorCount += 1;
// set done to false so that the error will be processed
done = false;
error = x.getMessage (); error = x.getMessage ();
if (error == null || error.length() == 0) if (error == null || error.length() == 0)
error = x.toString (); error = x.toString ();