Support Struts 7.0 (fixes CI muzzle failures) #12935
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
laurit
reviewed
Dec 20, 2024
| @@ -28,7 +29,8 @@ public class ActionInvocationInstrumentation implements TypeInstrumentation { | |||
|
|
|||
| @Override | |||
| public ElementMatcher<ClassLoader> classLoaderOptimization() { | |||
| return hasClassesNamed("com.opensymphony.xwork2.ActionInvocation"); | |||
| return hasClassesNamed("com.opensymphony.xwork2.ActionInvocation") | |||
| .and(not(hasClassesNamed("org.apache.struts2.ActionInvocation"))); | |||
There was a problem hiding this comment.
I'm not sure why this extra condition is necessary. Since the interface is in different package for struts7 it should clash with the instrumentation for older versions. I'll push to the pr and remove this check if it is needed then please add it back. I'll also move struts 2.3 and 7 instrumentation classes to different packages.
laurit
approved these changes
Dec 20, 2024
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.
Copy paste of Struts 2.3, adjusted for servlet 5 (jakarta) and opensymphony classes moved under struts package name