Repository: struts Updated Branches: refs/heads/develop 73da38e9d -> ff100ce2d
WW-4331 Returns null instead of throwing exception This allows other UnknownHandler to be called Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ff100ce2 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ff100ce2 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ff100ce2 Branch: refs/heads/develop Commit: ff100ce2d9c939e9cf4867bc46966a7dfecb6770 Parents: 73da38e Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Jul 28 21:17:13 2014 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Jul 28 21:17:13 2014 +0200 ---------------------------------------------------------------------- .../org/apache/struts2/convention/ConventionUnknownHandler.java | 2 +- .../src/main/java/com/opensymphony/xwork2/UnknownHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/ff100ce2/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java ---------------------------------------------------------------------- diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java index 273fd3e..ed70858 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java @@ -420,7 +420,7 @@ public class ConventionUnknownHandler implements UnknownHandler { * Not used */ public Object handleUnknownActionMethod(Object action, String methodName) throws NoSuchMethodException { - throw null; + return null; } public static class Resource { http://git-wip-us.apache.org/repos/asf/struts/blob/ff100ce2/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java b/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java index 033c0d6..8e9303a 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java @@ -53,8 +53,8 @@ public interface UnknownHandler { * @since 2.1 * @param action The action object * @param methodName The method name to call - * @return The result returned from invoking the action method - * @throws NoSuchMethodException If the method cannot be found + * @return The result returned from invoking the action method, can return <tt>null</tt> + * @throws NoSuchMethodException If the method cannot be found (deprecated) - should return nunll instead */ public Object handleUnknownActionMethod(Object action, String methodName) throws NoSuchMethodException; }
