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

CLDR-16797 Fix deadlock in the CLDR Tools library #3062

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1211,10 +1211,17 @@ public XPathParts cloneAsThawed() {
}

public static XPathParts getFrozenInstance(String path) {
XPathParts result =
cache.computeIfAbsent(
path,
(String forPath) -> new XPathParts().addInternal(forPath, true).freeze());
XPathParts result = cache.get(path);
if (result == null) {
// If we create the value in the lambda inside computeIfAbsent we lock
// The DtdData also caches aggressively, in a ConcurrentHashMap and
// also calling computeIfAbsent.
// With this change we might create a throw-away value (temp) ia something
// else won a race and added already added a value for path.
// But should be rare enough (we already tested if the key has a value)
final XPathParts temp = new XPathParts().addInternal(path, true).freeze();
result = cache.computeIfAbsent(path, (forPath) -> temp);
}
return result;
}

Expand Down
Loading