You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2004/12/31 04:13:19 UTC
svn commit: r123764 - /struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java /struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
Author: craigmcc
Date: Thu Dec 30 19:13:18 2004
New Revision: 123764
URL: http://svn.apache.org/viewcvs?view=rev&rev=123764
Log:
Wrap lifecycle.render(context) calls in try/finally so the request can be
cleaned up even if rendering throws an exception.
PR: Bugzilla #32370
Submitted By: Chris Fraser <cfraser AT ticketweb.com>
Modified:
struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
Modified: struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
Url: http://svn.apache.org/viewcvs/struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java?view=diff&rev=123764&p1=struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java&r1=123763&p2=struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java&r2=123764
==============================================================================
--- struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java (original)
+++ struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java Thu Dec 30 19:13:18 2004
@@ -149,15 +149,18 @@
if (log.isTraceEnabled()) {
log.trace(" Rendering view for '" + uri + "'");
}
- lifecycle.render(context);
- if (created) {
- if (log.isTraceEnabled()) {
- log.trace(" Releasing context for '" + uri + "'");
- }
- context.release();
- } else {
- if (log.isTraceEnabled()) {
- log.trace(" Rendering completed");
+ try {
+ lifecycle.render(context);
+ } finally {
+ if (created) {
+ if (log.isTraceEnabled()) {
+ log.trace(" Releasing context for '" + uri + "'");
+ }
+ context.release();
+ } else {
+ if (log.isTraceEnabled()) {
+ log.trace(" Rendering completed");
+ }
}
}
Modified: struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
Url: http://svn.apache.org/viewcvs/struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java?view=diff&rev=123764&p1=struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java&r1=123763&p2=struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java&r2=123764
==============================================================================
--- struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java (original)
+++ struts/faces/trunk/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java Thu Dec 30 19:13:18 2004
@@ -149,15 +149,18 @@
if (log.isTraceEnabled()) {
log.trace(" Rendering view for '" + uri + "'");
}
- lifecycle.render(context);
- if (created) {
- if (log.isTraceEnabled()) {
- log.trace(" Releasing context for '" + uri + "'");
- }
- context.release();
- } else {
- if (log.isTraceEnabled()) {
- log.trace(" Rendering completed");
+ try {
+ lifecycle.render(context);
+ } finally {
+ if (created) {
+ if (log.isTraceEnabled()) {
+ log.trace(" Releasing context for '" + uri + "'");
+ }
+ context.release();
+ } else {
+ if (log.isTraceEnabled()) {
+ log.trace(" Rendering completed");
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org