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

allowed requests to be attached until finally clause is reached

Browse source
This commit is contained in:
hns 2001-02-26 22:04:02 +00:00
parent ac52a14efc
commit 9b0680e5d6
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/helma/framework/core/Application.java
View file

@ -259,6 +259,7 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, Runn
res.write ("Error in application: <b>" + x.getMessage () + "</b>");
} finally {
if (primaryRequest) {
activeRequests.remove (req);
releaseEvaluator (ev);
res.close (); // this needs to be done before sending it back
} else {

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

@ -533,19 +533,15 @@ public class RequestEvaluator implements Runnable {
this.user = user;
this.res = new ResponseTrans ();
try {
app.activeRequests.put (req, this);
app.activeRequests.put (req, this);
checkThread ();
wait (app.requestTimeout);
if (reqtype != NONE) {
IServer.getLogger().log ("Stopping Thread for Request "+app.getName()+"/"+req.path);
stopThread ();
res.reset ();
res.write ("<b>Error in application '"+app.getName()+"':</b> <br><br><pre>Request timed out.</pre>");
}
} finally {
app.activeRequests.remove (req);
checkThread ();
wait (app.requestTimeout);
if (reqtype != NONE) {
IServer.getLogger().log ("Stopping Thread for Request "+app.getName()+"/"+req.path);
stopThread ();
res.reset ();
res.write ("<b>Error in application '"+app.getName()+"':</b> <br><br><pre>Request timed out.</pre>");
}
return res;