From 1b90e9461558b55639674ffa77ce0a80edb58c02 Mon Sep 17 00:00:00 2001 From: ron Date: Fri, 18 Aug 2017 14:54:55 +0200 Subject: [PATCH] Fix "java.io.IOException: Read end dead" when different Threads are writing to a single PipedOutputStream --- .../jackhuang/hmcl/ui/LaunchingUIDaemon.java | 34 ++++++++----------- .../org/jackhuang/hmcl/util/Log4jHandler.java | 25 ++++++++++++-- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LaunchingUIDaemon.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LaunchingUIDaemon.java index eea6425df9..909de63ecb 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LaunchingUIDaemon.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LaunchingUIDaemon.java @@ -52,8 +52,9 @@ import org.xml.sax.XMLReader; * @author huangyuhui */ public class LaunchingUIDaemon { - + XMLReader reader; + Log4jHandler logHandler; public LaunchingUIDaemon() { HMCLApi.EVENT_BUS.channel(LaunchingStateChangedEvent.class).register(LAUNCHING_STATE_CHANGED); @@ -76,12 +77,12 @@ public class LaunchingUIDaemon { PipedOutputStream os = new PipedOutputStream(); monitor.setTag(obj); try { - Log4jHandler handler = new Log4jHandler(monitor, os); - handler.addForbiddenToken(obj.getLoginResult().getAccessToken(), ""); - handler.addForbiddenToken(obj.getLoginResult().getSession(), ""); - handler.addForbiddenToken(obj.getLoginResult().getUserId(), ""); - handler.addForbiddenToken("Setting user: " + obj.getLoginResult().getUserName(), ""); - handler.start(); + logHandler = new Log4jHandler(monitor, os); + logHandler.addForbiddenToken(obj.getLoginResult().getAccessToken(), ""); + logHandler.addForbiddenToken(obj.getLoginResult().getSession(), ""); + logHandler.addForbiddenToken(obj.getLoginResult().getUserId(), ""); + logHandler.addForbiddenToken("Setting user: " + obj.getLoginResult().getUserName(), ""); + logHandler.start(); } catch(Exception e) { HMCLog.err("", e); } @@ -128,7 +129,7 @@ public class LaunchingUIDaemon { noExitThisTime = true; }); } - + static LauncherVisibility unpackProcessMonitor(Object obj) { GameLauncher launcher = ((GameLauncher) ((ProcessMonitor) obj).getTag()); HMCLGameLauncher.GameLauncherTag tag = (HMCLGameLauncher.GameLauncherTag) launcher.getTag(); @@ -161,9 +162,9 @@ public class LaunchingUIDaemon { ((HMCLGameLauncher.GameLauncherTag) value.getTag()).state = 2; }, MainFrame.INSTANCE::failed, Settings.getInstance().getAuthenticator().getPassword()); } - + class PrintlnProcessor implements Consumer { - + GameLauncher launcher; PipedOutputStream os; @@ -174,13 +175,8 @@ public class LaunchingUIDaemon { @Override public void accept(PrintlnEvent t) { - if (!t.isError()) - try { - os.write((t.getLine() + C.LINE_SEPARATOR).replace("log4j:Event", "log4j_Event").replace("log4j:Message", "log4j_Message").getBytes()); - os.flush(); - } catch(IOException e) { - HMCLog.err("", e); - } + if (!t.isError() && logHandler != null) + logHandler.writeAndFlush((t.getLine() + C.LINE_SEPARATOR).replace("log4j:Event", "log4j_Event").replace("log4j:Message", "log4j_Message")); else System.err.println(t.getLine()); HMCLGameLauncher.GameLauncherTag tag = (HMCLGameLauncher.GameLauncherTag) launcher.getTag(); LauncherVisibility l = tag.launcherVisibility; @@ -192,7 +188,7 @@ public class LaunchingUIDaemon { HMCLApi.EVENT_BUS.fireChannel(new LaunchingStateChangedEvent(launcher, LaunchingState.Done)); } } - + } private static final Consumer LAUNCHING_STATE_CHANGED = t -> { @@ -253,5 +249,5 @@ public class LaunchingUIDaemon { } MainFrame.INSTANCE.closeMessage(); }; - + } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/Log4jHandler.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/Log4jHandler.java index e113c26de1..c461a623e4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/Log4jHandler.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/Log4jHandler.java @@ -66,8 +66,7 @@ public class Log4jHandler extends Thread implements Consumer".getBytes()); - outputStream.flush(); + writeAndFlush(""); reader.setContentHandler(new Log4jHandlerImpl()); reader.parse(new InputSource(inputStream)); } catch (SAXException | IOException e) { @@ -78,8 +77,8 @@ public class Log4jHandler extends Thread implements Consumer"); try { - outputStream.write("".getBytes()); outputStream.close(); } catch (IOException ignore) { // won't happen throw new Error(ignore); @@ -87,6 +86,26 @@ public class Log4jHandler extends Thread implements Consumer