Issue #5088 Review ContextHandler locking #5094
Merged
Conversation
This file contains hidden or 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
The locking was primarily as a memory guard for the availability status, which was already volatile. Have instead using an AtomicReference with a simple state machine layered on top of start/stop lifecycle. There was also protection for AttributesMap, which is no longer needed as AttributesMap is now concurrent.
gregw
commented
Jul 29, 2020
| @@ -1805,7 +1805,7 @@ public void setMetaData(org.eclipse.jetty.http.MetaData.Request request) | |||
| } | |||
| else if (encoded.startsWith("/")) | |||
| { | |||
| path = (encoded.length() == 1) ? "/" : URIUtil.canonicalPath(URIUtil.decodePath(encoded)); | |||
| path = (encoded.length() == 1) ? "/" : URIUtil.canonicalPath(uri.getDecodedPath()); | |||
There was a problem hiding this comment.
oops this is an unrelated change that accidentally slipped in.
The uri.getDecodedPath() method does exactly URIUtil.decodePath(encoded), but caches the results so they can be reused if needed again.
janbartel
reviewed
Jul 29, 2020
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
Show resolved
Hide resolved
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
Show resolved
Hide resolved
| @@ -230,10 +231,10 @@ public static void setServerInfo(String serverInfo) | |||
|
|
|||
| public enum Availability | |||
| { | |||
| UNAVAILABLE, STARTING, AVAILABLE, SHUTDOWN, | |||
| STOPPED, STARTING, AVAILABLE, UNAVAILABLE, SHUTDOWN, | |||
There was a problem hiding this comment.
Can we have a comment about the meanings of the different states, particularly UNAVAILABLE vs STOPPED, which is a new state.
janbartel
approved these changes
Jul 29, 2020
joakime
reviewed
Jul 29, 2020
| // canonicalPath() is not responsible for decoding characters | ||
| {"/foo/.;/bar", "/foo/.;/bar"}, | ||
| {"/foo/..;/bar", "/foo/..;/bar"}, | ||
| {"/foo/..;/..;/bar", "/foo/..;/..;/bar"}, |
There was a problem hiding this comment.
This is an unrelated change.
There was a problem hiding this comment.
Yes, see note explaining it above.
There was a problem hiding this comment.
Oh no it's another unrelated change! Double ooops
There was a problem hiding this comment.
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.
The locking was primarily as a memory guard for the availability status, which was already volatile.
Have instead using an AtomicReference with a simple state machine layered on top of start/stop lifecycle.
There was also protection for AttributesMap, which is no longer needed as AttributesMap is now concurrent.