jmitchell 2003/12/23 06:28:35
Modified: src/share/org/apache/struts/actions DispatchAction.java
Log:
Fix my prior fix for preventing possible recursive calls
Revision Changes Path
1.23 +15 -14
jakarta-struts/src/share/org/apache/struts/actions/DispatchAction.java
Index: DispatchAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/actions/DispatchAction.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DispatchAction.java 22 Dec 2003 19:42:32 -0000 1.22
+++ DispatchAction.java 23 Dec 2003 14:28:35 -0000 1.23
@@ -135,6 +135,7 @@
* @author Ted Husted
* @author Leonardo Quijano
* @author Rob Leland
+ * @author Jea-noel Ribette
* @version $Revision$ $Date$
*/
public abstract class DispatchAction extends Action {
@@ -224,19 +225,19 @@
throw new ServletException(message);
}
- // Prevent recursive calls
- if (parameter.equals("execute") || parameter.equals("perform")){
- String message =
- messages.getMessage("dispatch.recursive",
mapping.getPath());
-
- log.error(message);
+ // Get the method's name. This could be overridden in subclasses.
+ String name = getMethodName(mapping, form, request, response, parameter);
- throw new ServletException(message);
- }
+ // Prevent recursive calls
+ if ("execute".equals(name) || "perform".equals(name)){
+ String message =
+ messages.getMessage("dispatch.recursive", mapping.getPath());
+
+ log.error(message);
+ throw new ServletException(message);
+ }
- // Get the method's name. This could be overridden in subclasses.
- String name = getMethodName(mapping, form, request, response, parameter);
// Invoke the named method, and return the result
return dispatchMethod(mapping, form, request, response, name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
