Merge pull request #4 from apache/master update pull
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/778eec3b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/778eec3b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/778eec3b Branch: refs/heads/master Commit: 778eec3b94f283290f186c8caffd10f03576fa27 Parents: e05f9f0 6fb870d Author: victor sosa <victors...@users.noreply.github.com> Authored: Tue Jan 26 08:38:50 2016 -0400 Committer: victor sosa <victors...@users.noreply.github.com> Committed: Tue Jan 26 08:38:50 2016 -0400 ---------------------------------------------------------------------- .../com/opensymphony/xwork2/XWorkConstants.java | 1 + .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 15 +++++++++-- .../xwork2/ognl/OgnlValueStack.java | 1 + .../xwork2/ognl/SecurityMemberAccess.java | 16 +++++++++++- .../xwork2/util/LocalizedTextUtil.java | 26 +++++++++++++------- .../org/apache/struts2/StrutsConstants.java | 1 + .../config/DefaultBeanSelectionProvider.java | 1 + core/src/main/resources/struts-default.xml | 20 ++++++--------- .../xwork2/ognl/SecurityMemberAccessTest.java | 20 ++++++++++++++- 9 files changed, 75 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
