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 2019/01/10 07:52:26 UTC

[struts] 01/01: Merge pull request #311 from JCgH4164838Gh792C124B5/localS2_26x_B1

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit aabed3e33fbe55aac96b4e5bd6d1cac415bceba1
Merge: 7e724a0 7a9d51f
Author: Lukasz Lenart <lu...@gmail.com>
AuthorDate: Thu Jan 10 08:52:20 2019 +0100

    Merge pull request #311 from JCgH4164838Gh792C124B5/localS2_26x_B1
    
    Equivalent to PR#309, but for the master (2.6.x) branch.

 .../main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java    | 13 -------------
 .../java/com/opensymphony/xwork2/ognl/OgnlValueStack.java   |  6 ------
 .../com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java |  4 ----
 .../xwork2/ognl/accessor/CompoundRootAccessor.java          |  4 ----
 .../xwork2/security/DefaultAcceptedPatternsChecker.java     |  3 +--
 .../xwork2/security/DefaultExcludedPatternsChecker.java     |  9 ++-------
 6 files changed, 3 insertions(+), 36 deletions(-)