You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2004/10/26 08:31:13 UTC

svn commit: rev 55576 - struts/trunk/src/share/org/apache/struts/tiles

Author: husted
Date: Mon Oct 25 23:31:13 2004
New Revision: 55576

Modified:
   struts/trunk/src/share/org/apache/struts/tiles/ComponentContext.java
Log:
Apply #31348 "Using a tiles definition as errorPage causes infinite looping" submitted by Matt Meyer.

Modified: struts/trunk/src/share/org/apache/struts/tiles/ComponentContext.java
==============================================================================
--- struts/trunk/src/share/org/apache/struts/tiles/ComponentContext.java	(original)
+++ struts/trunk/src/share/org/apache/struts/tiles/ComponentContext.java	Mon Oct 25 23:31:13 2004
@@ -178,10 +178,13 @@
     /**
      * Get component context from request.
      * @param request ServletRequest.
-     * @return ComponentContext
+     * @return ComponentContext or null if context is not found or an
+     * jspException is present in the request.
      */
     static public ComponentContext getContext(ServletRequest request) {
-        return (ComponentContext) request.getAttribute(
+       if (request.getAttribute("javax.servlet.jsp.jspException") != null) {
+           return null;
+        }        return (ComponentContext) request.getAttribute(
             ComponentConstants.COMPONENT_CONTEXT);
     }
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org