Skip to content

Improve thread safety in AquaNativeRendering and close stream in getStringResource() #15

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
karlvr wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −7
Open

Improve thread safety in AquaNativeRendering and close stream in getStringResource() #15

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
13 changes: 6 additions & 7 deletions src/org/violetlib/jnr/aqua/AquaNativeRendering.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

public class AquaNativeRendering
{
private static boolean isInitialized;
private static volatile boolean isInitialized;

private static @Nullable AquaUIPainter preferredPainter;

Expand Down Expand Up @@ -100,9 +100,8 @@ public static void showVersion() {

private static @NotNull String getStringResource(@NotNull String name)
{
InputStream s = AquaNativeRendering.class.getResourceAsStream(name);
if (s != null) {
try {
try (InputStream s = AquaNativeRendering.class.getResourceAsStream(name)) {
if (s != null) {
BufferedReader r = new BufferedReader(new InputStreamReader(s));
StringBuilder sb = new StringBuilder();
for (; ; ) {
Expand All @@ -113,8 +112,8 @@ public static void showVersion() {
sb.append((char) ch);
}
return sb.toString();
} catch (IOException ex) {
}
} catch (IOException ex) {
}

return "Unknown";
Expand All @@ -126,8 +125,6 @@ private static synchronized void findPainterClasses()
return;
}

isInitialized = true;

AquaUIPainter viewPainter;
AquaUIPainter coreUIPainter;
AquaUIPainter jrsPainter = null;
Expand Down Expand Up @@ -171,6 +168,8 @@ private static synchronized void findPainterClasses()
debug("Using JRS painter as preferred painter");
preferredPainter = jrsPainter; // last because it has the most limitations
}

isInitialized = true;
}

protected static void debug(@NotNull String s)
Expand Down