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

Rethrow wrapped ConcurrencyExceptions. Also updated code to

Browse source 
rethrow wrapped TimeoutExceptions.
This commit is contained in:
hns 2003-11-26 11:38:36 +00:00
parent 846ff46e1e
commit 6da249a73d
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/helma/scripting/rhino/RhinoEngine.java
View file

@ -276,26 +276,25 @@ public class RhinoEngine implements ScriptingEngine {
} catch (ConcurrencyException concur) {
throw concur;
} catch (Exception x) {
// check if this is a redirect exception, which has been converted by fesi
// into an EcmaScript exception, which is why we can't explicitly catch it
if (reval.res.getRedirect() != null) {
throw new RedirectException(reval.res.getRedirect());
}
// do the same for not-modified responses
if (reval.res.getNotModified()) {
throw new RedirectException(null);
}
// has the request timed out? If so, throw TimeoutException
if (thread != Thread.currentThread())
throw new TimeoutException ();
// create and throw a ScriptingException with the right message
String msg;
if (x instanceof JavaScriptException) {
msg = ((JavaScriptException) x).getValue().toString();
} else if (x instanceof WrappedException) {
msg = ((WrappedException) x).getWrappedException().toString();
Throwable wrapped = ((WrappedException) x).getWrappedException();
// if this is a wrapped concurrencyException, rethrow it.
if (wrapped instanceof ConcurrencyException) {
throw (ConcurrencyException) wrapped;
}
// also check if this is a wrapped redirect exception
if (wrapped instanceof RedirectException) {
throw (RedirectException) wrapped;
}
msg = wrapped.toString();
} else {
msg = x.toString();
}