From 07ab01490f766ec1804531f4dbe348eb25731cb3 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Mon, 16 Jul 2001 13:43:28 +0000
Subject: [PATCH] rethrow ConcurrencyException and RedirectException in Macro
 evaluation

---
 src/helma/framework/core/Skin.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/helma/framework/core/Skin.java b/src/helma/framework/core/Skin.java
index bfe34a37..61a91e47 100644
--- a/src/helma/framework/core/Skin.java
+++ b/src/helma/framework/core/Skin.java
@@ -11,6 +11,7 @@ import FESI.Data.*;
 import FESI.Exceptions.*;
 import helma.objectmodel.INode;
 import helma.objectmodel.IServer;
+import helma.objectmodel.ConcurrencyException;
 
 
 /**
@@ -64,7 +65,7 @@ public class Skin {
 	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)
 	    return;
 	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)) {
 	        renderFromResponse (reval);
@@ -246,6 +247,10 @@ public class Skin {
 	            reval.res.write (" "+msg+" ");
 	            app.logEvent (msg);
 	        }
+	    } catch (RedirectException redir) {
+	        throw redir;
+	    } catch (ConcurrencyException concur) {
+	        throw concur;
 	    } catch (Exception x) {
 	        String msg = "[HopMacro error: "+x+"]";
 	        reval.res.write (" "+msg+" ");