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:25 UTC

[struts] branch master updated (7e724a0 -> aabed3e)

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

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


    from 7e724a0  Merge pull request #307 from JCgH4164838Gh792C124B5/localS2_26_PluginFix1
     add 7a9d51f  Equivalent to PR#309 for master (2.6.x) branch. - Removed most of the logging added in PR#292. - Left the added logging for the setExcludedPatterns and setAcceptedPatterns methods in their respective modules.   L. Lenart's comment indicated their benefit outweighs overhead (not something that changes often).   Made the if-else blocks consistent with preferred styling for the log blocks. - Removed a dangling "/**" start comment tag with no proper close (and the whitespace [...]
     new aabed3e  Merge pull request #311 from JCgH4164838Gh792C124B5/localS2_26x_B1

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../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(-)


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

Posted by lu...@apache.org.
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(-)