Some fixes for running cometd6 on jetty-10 #3702
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
sbordet
requested changes
May 28, 2019
| { | ||
| super.init(config); | ||
| config.getServletContext().log("org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter is deprecated. Use org.eclipse.jetty.websocket.server.WebSocketUpgradeFilter"); | ||
| } |
There was a problem hiding this comment.
The message is wrong, it should be the other way around.
Use WebSocketUpgradeFilter.class.getName() instead of the explicit string.
Also, you want this to be logged via a normal Logger instance too, not only using the ServletContext.log?
There was a problem hiding this comment.
Fixed the message.
The context logger is typically just a normal Logger also, so it get's the message out.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
gregw
force-pushed
the
jetty-10.0.x-cometd6-fixes
branch
from
ec7b268 to
da34fba
Compare
Signed-off-by: Greg Wilkins <gregw@webtide.com>
sbordet
requested changes
May 28, 2019
| import javax.servlet.ServletException; | ||
|
|
||
| /** | ||
| * @Deprecated Moved to #org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter |
There was a problem hiding this comment.
The javadoc deprecation as lower case d for "deprecated".
| super.init(config); | ||
| config.getServletContext().log( | ||
| WebSocketUpgradeFilter.class.getName() + | ||
| " is deprecated Use " + |
There was a problem hiding this comment.
Missing a comma or a full stop? Capital U for "Use"?
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
sbordet
approved these changes
May 28, 2019
| if (_dispatches==0) | ||
| return type==REQUEST || type==ASYNC && _holder.isAsyncSupported(); | ||
| return type==REQUEST || type==ASYNC && holder.isAsyncSupported(); |
There was a problem hiding this comment.
Just a nit pick, can you properly indent this return?
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.
some minor fixes found while testing cometd6