Author: niallp
Date: Sun Oct  3 00:23:32 2004
New Revision: 51825

Modified:
   struts/trunk/src/share/org/apache/struts/tiles/ControllerSupport.java
Log:
Bug 31481 Have execute() call perform() for backward compatibility - reported by Lars 
Beuster

Modified: struts/trunk/src/share/org/apache/struts/tiles/ControllerSupport.java
==============================================================================
--- struts/trunk/src/share/org/apache/struts/tiles/ControllerSupport.java       
(original)
+++ struts/trunk/src/share/org/apache/struts/tiles/ControllerSupport.java       Sun 
Oct  3 00:23:32 2004
@@ -1,7 +1,7 @@
 /*
  * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ControllerSupport.java,v 
1.8 2004/03/14 06:23:43 sraeburn Exp $
  * $Revision: 1.8 $
- * $Date: 2004/03/14 06:23:43 $
+ * $Date$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
  * 
@@ -41,6 +41,8 @@
         * @param request Current request
         * @param response Current response
         * @param servletContext Current servlet context
+       * @deprecated Use execute() instead.  This will be removed after 
+       * Struts 1.2.
         */
        public void perform(
                ComponentContext tileContext,
@@ -48,12 +50,6 @@
                HttpServletResponse response,
                ServletContext servletContext)
                throws ServletException, IOException {
-
-               try {
-                       this.execute(tileContext, request, response, servletContext);
-               } catch (Exception e) {
-                       throw new ServletException(e);
-               }
        }
 
        /**
@@ -66,5 +62,6 @@
                ServletContext servletContext)
                throws Exception {
 
+            perform(tileContext, request, response, servletContext);
        }
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to