dgraham 2003/09/12 17:33:27
Modified: src/share/org/apache/struts/taglib/tiles InsertTag.java
src/share/org/apache/struts/tiles TilesRequestProcessor.java
Log:
Catch and convert Exception in preparation for new Controller
execute() method.
Revision Changes Path
1.22 +13 -9
jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java
Index: InsertTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- InsertTag.java 13 Sep 2003 00:30:50 -0000 1.21
+++ InsertTag.java 13 Sep 2003 00:33:27 -0000 1.22
@@ -912,11 +912,15 @@
// Call controller if any
if (controller != null) {
- controller.perform(
- subCompContext,
- (HttpServletRequest)
pageContext.getRequest(),
- (HttpServletResponse)
pageContext.getResponse(),
- pageContext.getServletContext());
+ try {
+ controller.perform(
+ subCompContext,
+ (HttpServletRequest)
pageContext.getRequest(),
+ (HttpServletResponse)
pageContext.getResponse(),
+
pageContext.getServletContext());
+ } catch (Exception e) {
+ throw new ServletException(e);
+ }
}
1.21 +12 -8
jakarta-struts/src/share/org/apache/struts/tiles/TilesRequestProcessor.java
Index: TilesRequestProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesRequestProcessor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TilesRequestProcessor.java 13 Sep 2003 00:30:50 -0000 1.20
+++ TilesRequestProcessor.java 13 Sep 2003 00:33:27 -0000 1.21
@@ -255,11 +255,15 @@
// Execute controller associated to definition, if any.
if (controller != null) {
- controller.perform(
- tileContext,
- request,
- response,
- getServletContext());
+ try {
+ controller.perform(
+ tileContext,
+ request,
+ response,
+ getServletContext());
+ } catch (Exception e) {
+ throw new ServletException(e);
+ }
}
// If request comes from a previous Tile, do an include.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
