Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6d2a5735 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6d2a5735 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6d2a5735 Branch: refs/heads/master Commit: 6d2a57355eb596ddafacc7079b017c4d67d1d9f4 Parents: 1568813 954a29e Author: cnenning <cnenn...@apache.org> Authored: Wed Feb 3 10:51:53 2016 +0100 Committer: cnenning <cnenn...@apache.org> Committed: Wed Feb 3 10:51:53 2016 +0100 ---------------------------------------------------------------------- .../xwork2/config/entities/AllowedMethods.java | 3 + .../xwork2/config/impl/ActionConfigMatcher.java | 1 + .../interceptor/MessageStoreInterceptor.java | 39 ++++--- .../config/entities/AllowedMethodsTest.java | 15 +++ .../config/impl/ActionConfigMatcherTest.java | 16 ++- .../MessageStoreInterceptorTest.java | 116 ++++++++++++++++++- 6 files changed, 169 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
