fix scope bug in transaction handling

darcs-hash:20041205142821-2eb37-51b9809edf96831bb7236548efc3d3b7d4f21e07.gz

diff --git a/src/java/org/ibex/xt/Servlet.java b/src/java/org/ibex/xt/Servlet.java
index c53ae4f..71eedbb 100644 (file)
--- 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 (file)
--- 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 {