From a86e3334b03e5acf25fe9223d9d7634573a6c396 Mon Sep 17 00:00:00 2001 From: crawshaw Date: Sun, 5 Dec 2004 14:28:21 +0000 Subject: [PATCH] fix scope bug in transaction handling darcs-hash:20041205142821-2eb37-51b9809edf96831bb7236548efc3d3b7d4f21e07.gz --- src/java/org/ibex/xt/Servlet.java | 1 - src/java/org/ibex/xt/Template.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/ibex/xt/Servlet.java b/src/java/org/ibex/xt/Servlet.java index c53ae4f..71eedbb 100644 --- a/src/java/org/ibex/xt/Servlet.java +++ b/src/java/org/ibex/xt/Servlet.java @@ -209,7 +209,6 @@ public class Servlet extends HttpServlet { public void put(Object key, Object val) throws JSExn { try { //#switch(JS.toString(key)) - case "transaction": transaction((JS)val); case "response.code": response.setStatus(JS.toInt(val)); case "response.redirect": response.sendRedirect(JS.toString(val)); case "response.contentType": response.setContentType(JS.toString(val)); diff --git a/src/java/org/ibex/xt/Template.java b/src/java/org/ibex/xt/Template.java index 323fb00..6afe1b2 100644 --- a/src/java/org/ibex/xt/Template.java +++ b/src/java/org/ibex/xt/Template.java @@ -235,7 +235,8 @@ public class Template extends JSLeaf.Element { StringReader sr = new StringReader(sw.toString()); JS t; - try { t = JS.fromReader("input", 0, sr); } + try { t = JS.cloneWithNewParentScope( + JS.fromReader("input", 0, sr), new JSScope(null)); } catch (IOException e) { throw new JSLeaf.Exn(e.getMessage()); } try { -- 1.7.10.4