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

* Switch back to old semantics of res.abort() to abort the transaction and stop execution.

Browse source 
* Introduce new res.rollback() method that just aborts the db transaction, but keeps executing.
* Add zero argument res.pushBuffer() for convenience.
This commit is contained in:
hns 2007-04-02 15:45:31 +00:00
parent a88aebf2fb
commit a0ea3b31de
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/helma/framework/ResponseBean.java
View file

@ -117,6 +117,7 @@ public class ResponseBean implements Serializable {
/** /**
* Returns the ServletResponse instance for this Response. * Returns the ServletResponse instance for this Response.
* Returns null for internal and XML-RPC requests. * Returns null for internal and XML-RPC requests.
* @return the servlet response
*/ */
public HttpServletResponse getServletResponse() { public HttpServletResponse getServletResponse() {
return res.getServletResponse(); return res.getServletResponse();
@ -505,13 +506,24 @@ public class ResponseBean implements Serializable {
* Push a string buffer on the response object. All further * Push a string buffer on the response object. All further
* writes will be redirected to this buffer. * writes will be redirected to this buffer.
* @param buffer the string buffer * @param buffer the string buffer
* @return the new stringBuffer
*/ */
public void pushBuffer(StringBuffer buffer) { public StringBuffer pushBuffer(StringBuffer buffer) {
res.pushBuffer(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 * Pops the current response buffer without converting it to a string
* @return the stringBuffer
*/ */
public StringBuffer popBuffer() { public StringBuffer popBuffer() {
return res.popBuffer(); return res.popBuffer();
@ -530,7 +542,7 @@ public class ResponseBean implements Serializable {
* Commit changes made during the course of the current transaction * Commit changes made during the course of the current transaction
* and start a new one * and start a new one
* *
* @throws Exception * @throws Exception thrown if commit fails
*/ */
public void commit() throws Exception { public void commit() throws Exception {
if (Thread.currentThread() instanceof Transactor) { if (Thread.currentThread() instanceof Transactor) {
@ -542,11 +554,11 @@ public class ResponseBean implements Serializable {
} }
/** /**
* Abort the current transaction and start a new one * Rollback the current transaction and start a new one.
* *
* @throws Exception * @throws Exception thrown if rollback fails
*/ */
public void abort() throws Exception { public void rollback() throws Exception {
if (Thread.currentThread() instanceof Transactor) { if (Thread.currentThread() instanceof Transactor) {
Transactor tx = (Transactor) Thread.currentThread(); Transactor tx = (Transactor) Thread.currentThread();
String tname = tx.getTransactionName(); 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();
}
} }