From a0ea3b31de2a5f3ca8ab1a5485e1f6b802295d18 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Mon, 2 Apr 2007 15:45:31 +0000
Subject: [PATCH] * Switch back to old semantics of res.abort() to abort the
 transaction and stop execution. * Introduce new res.rollback() method that
 just aborts the db transaction, but keeps executing. * Add zero argument
 res.pushBuffer() for convenience.

---
 src/helma/framework/ResponseBean.java | 36 +++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/helma/framework/ResponseBean.java b/src/helma/framework/ResponseBean.java
index c90781ef..6939902c 100644
--- a/src/helma/framework/ResponseBean.java
+++ b/src/helma/framework/ResponseBean.java
@@ -117,6 +117,7 @@ public class ResponseBean implements Serializable {
     /**
      * Returns the ServletResponse instance for this Response.
      * Returns null for internal and XML-RPC requests.
+     * @return the servlet response
      */
     public HttpServletResponse getServletResponse() {
         return res.getServletResponse();
@@ -505,13 +506,24 @@ public class ResponseBean implements Serializable {
      * Push a string buffer on the response object. All further
      * writes will be redirected to this buffer.
      * @param buffer the string buffer
+     * @return the new stringBuffer
      */
-    public void pushBuffer(StringBuffer buffer) {
-        res.pushBuffer(buffer);
+    public StringBuffer pushBuffer(StringBuffer buffer) {
+        return res.pushBuffer(buffer);
+    }
+
+    /**
+     * Push a string buffer on the response object. All further
+     * writes will be redirected to this buffer.
+     * @return the new stringBuffer
+     */
+    public StringBuffer pushBuffer() {
+        return res.pushBuffer(null);
     }
 
    /**
     * Pops the current response buffer without converting it to a string
+    * @return the stringBuffer
     */
    public StringBuffer popBuffer() {
         return res.popBuffer();
@@ -530,7 +542,7 @@ public class ResponseBean implements Serializable {
      * Commit changes made during the course of the current transaction
      * and start a new one
      *
-     * @throws Exception
+     * @throws Exception thrown if commit fails
      */
     public void commit() throws Exception {
         if (Thread.currentThread() instanceof Transactor) {
@@ -542,11 +554,11 @@ public class ResponseBean implements Serializable {
     }
 
     /**
-     * Abort the current transaction and start a new one
-     *  
-     * @throws Exception
+     * Rollback the current transaction and start a new one.
+     *
+     * @throws Exception thrown if rollback fails
      */
-    public void abort() throws Exception {
+    public void rollback() throws Exception {
         if (Thread.currentThread() instanceof Transactor) {
             Transactor tx = (Transactor) Thread.currentThread();
             String tname = tx.getTransactionName();
@@ -555,4 +567,14 @@ public class ResponseBean implements Serializable {
         }
     }
 
+    /**
+     * Rollback the current database transaction and abort execution.
+     * This has the same effect as calling rollback() and then stop().
+     *
+     * @throws AbortException thrown to exit the the current execution
+     */
+    public void abort() throws AbortException {
+        throw new AbortException();
+    }
+
 }