You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/05/02 14:53:23 UTC
[1/2] git commit: Overrides pattern exclusion initialisation to allow
test to pass
Repository: struts
Updated Branches:
refs/heads/develop 519aefdc8 -> d35072cd6
Overrides pattern exclusion initialisation to allow test to pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c9fd44fb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c9fd44fb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c9fd44fb
Branch: refs/heads/develop
Commit: c9fd44fbd552a8b3474fe846be2d2834453133ef
Parents: 1be8ed6
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 14:50:34 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 14:52:20 2014 +0200
----------------------------------------------------------------------
.../xwork2/interceptor/ParametersInterceptorTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c9fd44fb/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 4414666..7084924 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -183,6 +183,10 @@ public class ParametersInterceptorTest extends XWorkTestCase {
return result;
}
+ @Override
+ protected void initializeHardCodedExcludePatterns() {
+ excludeParams = new HashSet<Pattern>();
+ }
};
container.inject(pi);
[2/2] git commit: Merge branch 'master' into develop
Posted by lu...@apache.org.
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d35072cd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d35072cd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d35072cd
Branch: refs/heads/develop
Commit: d35072cd66f48205ac7e8affdfda8e6e6b86fa04
Parents: 519aefd c9fd44f
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 14:52:50 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 14:52:50 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------