You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/02/27 09:30:36 UTC

svn commit: r512175 - /tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java

Author: apetrelli
Date: Tue Feb 27 00:30:36 2007
New Revision: 512175

URL: http://svn.apache.org/viewvc?view=rev&rev=512175
Log:
TILES-122
Now the context is "ended" even if an exception in an attribute happens.

Modified:
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java?view=diff&rev=512175&r1=512174&r2=512175
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java Tue Feb 27 00:30:36 2007
@@ -75,20 +75,21 @@
     
 
     public int doEndTag() throws JspException {
-        if (isAccessAllowed()) {
-            try {
+        try {
+            if (isAccessAllowed()) {
                 execute();
-            } catch (TilesException e) {
-                String message = "Error executing tag: " + e.getMessage();
-                LOG.error(message, e);
-                throw new JspException(message, e);
-            } catch (IOException io) {
-                String message = "IO Error executing tag: " + io.getMessage();
-                LOG.error(message, io);
-                throw new JspException(message, io);
             }
+        } catch (TilesException e) {
+            String message = "Error executing tag: " + e.getMessage();
+            LOG.error(message, e);
+            throw new JspException(message, e);
+        } catch (IOException io) {
+            String message = "IO Error executing tag: " + io.getMessage();
+            LOG.error(message, io);
+            throw new JspException(message, io);
+        } finally {
+            endContext(pageContext);
         }
-        endContext(pageContext);
         
         return EVAL_PAGE;
     }