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.

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

Close locale streams #1832

Merged
merged 2 commits into from
Jan 12, 2021
+8 −2
Merged

Close locale streams #1832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ecd5bf
Close locale streams
Extollite Jan 12, 2021
3621084
Fix formatting
Extollite Jan 12, 2021
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
4 changes: 2 additions & 2 deletions connector/src/main/java/org/geysermc/connector/utils/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ public static Reflections getReflections(String path) {
* @return The byte array of the file
*/
public static byte[] readAllBytes(File file) {
try {
return readAllBytes(new FileInputStream(file));
try (InputStream inputStream = new FileInputStream(file)) {
return readAllBytes(inputStream);
} catch (IOException e) {
throw new RuntimeException("Cannot read " + file);
}
Expand Down
6 changes: 6 additions & 0 deletions connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@ private static void loadLocale(String locale) {

// Insert the locale into the mappings
LOCALE_MAPPINGS.put(locale.toLowerCase(), langMap);

try {
localeStream.close();
} catch (IOException e) {
throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.locale.fail.file", locale, e.getMessage()));
}
} else {
GeyserConnector.getInstance().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.locale.fail.missing", locale));
}
Expand Down