Skip to content

Make FontRegistry's table of font data thread safe #4266

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.

Sign up for GitHub

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

Open
HeikoKlare wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −3
Open

Make FontRegistry's table of font data thread safe #4266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FontRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ void addAllocatedFontsToStale(Font defaultFont) {
* (key type: <code>String</code>,
* value type: <code>org.eclipse.swt.graphics.FontData[]</code>).
*/
private final Map<String, FontData[]> stringToFontData = new HashMap<>(7);
private final Map<String, FontData[]> stringToFontData = new ConcurrentHashMap<>(7);

/**
* Collection of Fonts that are now stale to be disposed
Expand Down Expand Up @@ -816,14 +816,15 @@ private void put(String symbolicName, FontData[] fontData, boolean update) {
Assert.isNotNull(symbolicName);
Assert.isNotNull(fontData);

FontData[] existing = stringToFontData.get(symbolicName);
// single atomic read-modify-write; replacing an equal mapping with the
// given, content-equal one is a no-op for every reader
FontData[] existing = stringToFontData.put(symbolicName, fontData);
Comment thread
HeikoKlare marked this conversation as resolved.
if (Arrays.equals(existing, fontData)) {
return;
}

FontRecord oldFont = stringToFontRecord
.remove(symbolicName);
stringToFontData.put(symbolicName, fontData);
if (update) {
fireMappingChanged(symbolicName, existing, fontData);
}
Expand Down
Loading