From dd0b4bafe8f76dfdc7fd8a3dd6d593db922b9994 Mon Sep 17 00:00:00 2001
From: Extollite <42713788+Extollite@users.noreply.github.com>
Date: Tue, 12 Jan 2021 21:06:48 +0100
Subject: [PATCH] Close locale streams (#1832)

* Close locale streams

* Fix formatting
---
 .../main/java/org/geysermc/connector/utils/FileUtils.java   | 4 ++--
 .../main/java/org/geysermc/connector/utils/LocaleUtils.java | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/utils/FileUtils.java b/connector/src/main/java/org/geysermc/connector/utils/FileUtils.java
index 862af548d..d1dd6fd78 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/FileUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/FileUtils.java
@@ -217,8 +217,8 @@ public class FileUtils {
      * @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);
         }
diff --git a/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java b/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
index e180682d6..8619eaf0d 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
@@ -208,6 +208,12 @@ public class LocaleUtils {
 
             // 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));
         }