Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jetty 10.0.x servletholder copy #6280 #6281

Merged
merged 3 commits into from May 16, 2021

Conversation

gregw
Copy link
Contributor

@gregw gregw commented May 16, 2021

cherry pick of #6214 from 9.4 to 10 for #6280

joakime and others added 2 commits May 16, 2021 11:30
 ServletHolder.copyClassServlet() method added to correctly copy held class.


Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Fixed test to handle missing startWebapp

Signed-off-by: Greg Wilkins <gregw@webtide.com>
@gregw gregw requested a review from janbartel May 16, 2021 02:10
Copy link
Contributor

@janbartel janbartel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you delete the ForcedWebAppContext class because its unnecessary, I'm good.


public static class ForcedWebAppContext extends WebAppContext
{
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesnt need to be a class - you can add a bean to a standard WebAppContext.

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
@gregw gregw requested a review from janbartel May 16, 2021 07:49
Copy link
Contributor

@janbartel janbartel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm

@gregw gregw merged commit 804630d into jetty-10.0.x May 16, 2021
@gregw gregw deleted the jetty-10.0.x-servletholder-copy branch May 16, 2021 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants