FELIX-6746 Lazy initialization for servlets extending JettyWebSocketServlet #364
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 reproducer in integration test
- Call init lazy in case of servlets that extend JettyWebSocketServlet - This fixes the IT as well
- Extract test methods - Remove ServletWrapper support, as it doesn't work properly yet
- Make solution thread-safe - Fix destroy logic - Minor test improvements
- Add support for HttpService / ServletWrappers - Add IT to guard it
- Update whiteboard examples; the FelixJettyWebSocketServlet is no longer needed with these fixes
- Disable HTTP service test, as it fails with "java.lang.IllegalStateException: JettyServerFrameHandlerFactory not found"
- Fix passing along shared websocket attributes to the HttpContext in SharedHttpServiceImpl, when registerServlet is called - Enable test again
- Add NPE check
|
@enapps-enorman would you able to review this one? Since you handled the websocket functionality earlier as well. |
cziegeler
reviewed
Jan 21, 2025
http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandler.java
Outdated
Show resolved
Hide resolved
|
The PR looks good to me in general, maybe the special handling could be moved into a subclass (see comment)? |
- Move logic into subclass
…ss' into maintenance/FELIX-6746-websocketservlet-init-NPE
- Imports
- Minor changes
- Remove util class, move method to handler - Add unit test, add test scope dependency on jetty12
|
I made one last change, moved a method and added a unit test. |
paulrutter
deleted the
maintenance/FELIX-6746-websocketservlet-init-NPE
branch
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.
https://issues.apache.org/jira/projects/FELIX/issues/FELIX-6746
This PR adds lazy initialization for all servlets extending
JettyWebSocketServlet.This resolves the issue where this was needed for earlier.
It also fixes the case where the legacy HTTP service is used in combination with the
ServletWrapper.The
ServletWrapperinstances are checked against wrapping aJettyWebSocketServletas well.Two integration tests added:
JettyWebSocketServletvia the whiteboard pattern.JettyWebSocketServletvia the HTTP service (by usingServletWrapper). This required passing along the websocket attributes to the servlet context, whenregisterServletis called. This was already done for the whiteboard implementation earlier.The whiteboard example has also been updated to reflect this.
@cziegeler what do you think of this approach?