Fixes #5498 ServletHolder cleanup #5514
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
Various cleanups including: + renaming multiple `_servlet` fields in inner classes to avoid confusion + better comments in prepare method to describe why it is needed + call prepare from Invoker servlet + The `_servlet` field is not set until after the servlet is initialized + Consistent wrapping of `SingleThreadedWrapper` now in `initServlet` + The `getServlet` method now looks the volatile `_servlet` to avoid locking if possible + The `handle` method now calls `getServletInstance` as servlet will have been initialized in `prepare`
gregw
requested review from
joakime and
janbartel
and removed request for
joakime
Various cleanups including: + renaming multiple `_servlet` fields in inner classes to avoid confusion + better comments in prepare method to describe why it is needed + call prepare from Invoker servlet + The `_servlet` field is not set until after the servlet is initialized + Consistent wrapping of `SingleThreadedWrapper` now in `initServlet` + The `getServlet` method now looks the volatile `_servlet` to avoid locking if possible + The `handle` method now calls `getServletInstance` as servlet will have been initialized in `prepare` + Found and fixed race with making unavaiable servlet available again
…98-ServletHolder-cleanup
…98-ServletHolder-cleanup
|
@joakime @janbartel @lorban nudge |
lorban
requested changes
Oct 27, 2020
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
Outdated
Show resolved
Hide resolved
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
Outdated
Show resolved
Hide resolved
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
Outdated
Show resolved
Hide resolved
+ fixed nanotime overflow + fixed several compiler warnings/suggestions
lorban
approved these changes
Oct 27, 2020
janbartel
requested changes
Oct 27, 2020
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
Outdated
Show resolved
Hide resolved
+ removed while true from unavailable servlet
janbartel
requested changes
Oct 27, 2020
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
Outdated
Show resolved
Hide resolved
+ Do not destroy servlets unless init has been called. + Added TODOs about calling predestroy on instances not created by the holder.
+ Do not destroy servlets unless init has been called. + Added TODOs about calling predestroy on instances not created by the holder. + improved dump and toString
|
Why are we even letting people pull the I question this entirely. |
Well perhaps make it private rather than public, but we still need the basic logic..... but making it private is a bridge too far for 9 I think. |
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.
Various cleanups for #5498 including:
_servletfields in inner classes to avoid confusion_servletfield is not set until after the servlet is initializedSingleThreadedWrappernow ininitServletgetServletmethod now looks the volatile_servletto avoid locking if possiblehandlemethod now callsgetServletInstanceas servlet will have been initialized inprepare