GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Close locale streams (#1832)

Browse source 
* Close locale streams

* Fix formatting
This commit is contained in:
Extollite 2021-01-12 21:06:48 +01:00 committed by GitHub
parent af405f320a
commit dd0b4bafe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
connector/src/main/java/org/geysermc/connector/utils/FileUtils.java
View file

@ -217,8 +217,8 @@ public class FileUtils {
* @return The byte array of the file * @return The byte array of the file
*/ */
public static byte[] readAllBytes(File file) { public static byte[] readAllBytes(File file) {
try { try (InputStream inputStream = new FileInputStream(file)) {
return readAllBytes(new FileInputStream(file)); return readAllBytes(inputStream);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException("Cannot read " + file); throw new RuntimeException("Cannot read " + file);
} }

6
connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
View file

@ -208,6 +208,12 @@ public class LocaleUtils {
// Insert the locale into the mappings // Insert the locale into the mappings
LOCALE_MAPPINGS.put(locale.toLowerCase(), langMap); 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 { } else {
GeyserConnector.getInstance().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.locale.fail.missing", locale)); GeyserConnector.getInstance().getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.locale.fail.missing", locale));
} }