You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by pb...@apache.org on 2008/11/26 21:53:25 UTC

svn commit: r720974 - in /struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet: ServletMappingDispatcher.java ServletParameterDispatcher.java

Author: pbenedict
Date: Wed Nov 26 12:53:25 2008
New Revision: 720974

URL: http://svn.apache.org/viewvc?rev=720974&view=rev
Log:
STR-3168: Servlet implementations will 404 error on unspecified()

Modified:
    struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java?rev=720974&r1=720973&r2=720974&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java Wed Nov 26 12:53:25 2008
@@ -35,10 +35,10 @@
 	Action target = context.getAction();
 	Object[] args = ServletDispatchUtils.buildClassicExecuteArguments((ServletActionContext) context);
 	String path = context.getActionConfig().getPath();
-	return invoke(target, method, args, path, name);
+	return invoke(target, method, args, path);
     }
 
-    protected Method resolveMethod(String methodName, ActionContext context) throws NoSuchMethodException {
+    protected Method resolveMethod(ActionContext context, String methodName) throws NoSuchMethodException {
 	return ServletDispatchUtils.resolveClassicExecuteMethod(context, methodName);
     }
 

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java?rev=720974&r1=720973&r2=720974&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java Wed Nov 26 12:53:25 2008
@@ -35,10 +35,10 @@
 	Action target = context.getAction();
 	Object[] args = ServletDispatchUtils.buildClassicExecuteArguments((ServletActionContext) context);
 	String path = context.getActionConfig().getPath();
-	return invoke(target, method, args, path, name);
+	return invoke(target, method, args, path);
     }
 
-    protected Method resolveMethod(String methodName, ActionContext context) throws NoSuchMethodException {
+    protected Method resolveMethod(ActionContext context, String methodName) throws NoSuchMethodException {
 	return ServletDispatchUtils.resolveClassicExecuteMethod(context, methodName);
     }