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

rethrow ConcurrencyException and RedirectException in

Browse source 
Macro evaluation
This commit is contained in:
hns 2001-07-16 13:43:28 +00:00
parent d795dfbb48
commit 07ab01490f
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/helma/framework/core/Skin.java
View file

@ -11,6 +11,7 @@ import FESI.Data.*;
import FESI.Exceptions.*; import FESI.Exceptions.*;
import helma.objectmodel.INode; import helma.objectmodel.INode;
import helma.objectmodel.IServer; import helma.objectmodel.IServer;
import helma.objectmodel.ConcurrencyException;
/** /**
@ -64,7 +65,7 @@ public class Skin {
return source; return source;
} }
public void render (RequestEvaluator reval, ESNode thisNode, ESObject paramObject) { public void render (RequestEvaluator reval, ESNode thisNode, ESObject paramObject) throws RedirectException {
if (parts == null) if (parts == null)
return; return;
for (int i=0; i<parts.length; i++) { for (int i=0; i<parts.length; i++) {
@ -174,7 +175,7 @@ public class Skin {
} }
public void render (RequestEvaluator reval, ESNode thisNode, ESObject paramObject) { public void render (RequestEvaluator reval, ESNode thisNode, ESObject paramObject) throws RedirectException {
if ("response".equalsIgnoreCase (handler)) { if ("response".equalsIgnoreCase (handler)) {
renderFromResponse (reval); renderFromResponse (reval);
@ -246,6 +247,10 @@ public class Skin {
reval.res.write (" "+msg+" "); reval.res.write (" "+msg+" ");
app.logEvent (msg); app.logEvent (msg);
} }
} catch (RedirectException redir) {
throw redir;
} catch (ConcurrencyException concur) {
throw concur;
} catch (Exception x) { } catch (Exception x) {
String msg = "[HopMacro error: "+x+"]"; String msg = "[HopMacro error: "+x+"]";
reval.res.write (" "+msg+" "); reval.res.write (" "+msg+" ");