Initial attempt to address WW-5101 #460
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- 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.
|
Hello Apache Struts Team. This is an an initial attempt to address the reported issue. Basic local testing indicates it is working, with no illegal reflective access warnings seen with Java 11. People may decide to eventually remove the Please let me know if the PR looks OK when you have time. |
sepe81
reviewed
Dec 23, 2020
| * | ||
| * Note: With Java 9+, calling this method may result in "Illegal reflective access" warnings. Be aware | ||
| * its logic may fail in a future version of Java that blocks the reflection calls needed for this method. | ||
| * {<code></code> |
There was a problem hiding this comment.
Suggested change
| * {<code></code> |
this line can probably be omitted
sepe81
reviewed
Dec 23, 2020
|
|
||
| try { | ||
| if ("org.apache.catalina.loader.WebappClassLoader".equals(cl.getName())) { | ||
| clearMap(cl, loader, TOMCAT_RESOURCE_ENTRIES_FIELD); | ||
| if ( (TOMCAT_WEBAPP_CLASSLOADER.equals(cl.getName()) || TOMCAT_PARALLEL_WEBAPP_CLASSLOADER.equals(cl.getName())) && |
There was a problem hiding this comment.
Suggested change
| if ( (TOMCAT_WEBAPP_CLASSLOADER.equals(cl.getName()) || TOMCAT_PARALLEL_WEBAPP_CLASSLOADER.equals(cl.getName())) && | |
| if ((TOMCAT_WEBAPP_CLASSLOADER.equals(cl.getName()) || TOMCAT_PARALLEL_WEBAPP_CLASSLOADER.equals(cl.getName())) && |
consistent formatting
sepe81
reviewed
Dec 23, 2020
| if ("org.apache.catalina.loader.WebappClassLoader".equals(cl.getName())) { | ||
| clearMap(cl, loader, TOMCAT_RESOURCE_ENTRIES_FIELD); | ||
| if ( (TOMCAT_WEBAPP_CLASSLOADER.equals(cl.getName()) || TOMCAT_PARALLEL_WEBAPP_CLASSLOADER.equals(cl.getName())) && | ||
| (superCl != null && TOMCAT_WEBAPP_CLASSLOADER_BASE.equals(superCl.getName())) ) { |
There was a problem hiding this comment.
Suggested change
| (superCl != null && TOMCAT_WEBAPP_CLASSLOADER_BASE.equals(superCl.getName())) ) { | |
| (superCl != null && TOMCAT_WEBAPP_CLASSLOADER_BASE.equals(superCl.getName()))) { |
- 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.
|
No complains, so let's merge! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Initial attempt to address WW-5101