Fixed missed encoding in Log4jHandler

2018-02-27 11:13:07 +08:00
2 changed files with 5 additions and 7 deletions
@@ -494,11 +494,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
            FXUtils.setOverflowHidden((Region) content, true);
        }

-        if (content instanceof Refreshable)
-            refreshNavButton.setVisible(true);
-
-        if (content != mainPage)
-            backNavButton.setVisible(true);
+        refreshNavButton.setVisible(content instanceof Refreshable);
+        backNavButton.setVisible(content != mainPage);

        String prefix = category == null ? "" : category + " - ";

@@ -71,7 +71,8 @@ final class Log4jHandler extends Thread {
        setName("log4j-handler");

        try {
-            reader.parse(new InputSource(inputStream));
+            InputSource inputSource = new InputSource(inputStream);
+            reader.parse(inputSource);
        } catch (InterruptedIOException e) {
            // Game has been interrupted.
            interrupted.set(true);
@@ -108,7 +109,7 @@ final class Log4jHandler extends Thread {
                if (broken)
                    System.out.println(line);

-                byte[] bytes = (line + OperatingSystem.LINE_SEPARATOR).getBytes(Charsets.UTF_8);
+                byte[] bytes = (line + OperatingSystem.LINE_SEPARATOR).getBytes(Constants.SYSTEM_CHARSET);
                outputStream.write(bytes);
                outputStream.flush();
            } catch (IOException e) {