[struts] branch master updated (f91c558 -> 2139909)

[lu...@apache.org]

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 f91c558  Merge pull request #461 from apache/WW-5063-null-check
     new c2eadc2  Initial attempt to address WW-5101 - Add comments to methods related to ResrouceBundle cache clearing. - Correct clearTomcatCache() so that it acts as intended for Tomcat 7-10. - Add clearResourceBundleClassloaderCaches() method that uses standard Java API calls to perform the cache clearing. - Adjust clearMap() logic to only change accessiblity when required.
     new 2020e2f  Updated commit based on feedback, plus a few minor changes: - Changed formatting as per review. - Added null guard for unlikely dereference in clearTomcatCache() logging statement. - Added a unit test for basic correctness check and better code coverage.
     new 2139909  Merge pull request #460 from JCgH4164838Gh792C124B5/localS2_26_WW-5101_cleanupfix1

The 6032 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:
 .../xwork2/util/AbstractLocalizedTextProvider.java | 86 +++++++++++++++++-----
 .../util/StrutsLocalizedTextProviderTest.java      | 78 ++++++++++++++++++++
 2 files changed, 146 insertions(+), 18 deletions(-)