Windows: Avoid race condition when starting input pump thread

jline · Sep 20, 2017 · 938eeca · 938eeca
1 parent ec009b5
commit 938eeca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java
@@ -36,6 +36,9 @@ public JansiWinSysTerminal(String name, boolean nativeSignals) throws IOExceptio
     public JansiWinSysTerminal(String name, int codepage, boolean nativeSignals, SignalHandler signalHandler) throws IOException {
         super(new WindowsAnsiWriter(new BufferedWriter(new JansiWinConsoleWriter())),
               name, codepage, nativeSignals, signalHandler);
+
+        // Start input pump thread
+        pump.start();
     }
 
     @Override

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java
@@ -32,6 +32,9 @@ public JnaWinSysTerminal(String name, int codepage, boolean nativeSignals, Signa
         super(new WindowsAnsiWriter(new BufferedWriter(new JnaWinConsoleWriter(consoleOut)), consoleOut),
               name, codepage, nativeSignals, signalHandler);
         strings.put(InfoCmp.Capability.key_mouse, "\\E[M");
+
+        // Start input pump thread
+        pump.start();
     }
 
     @Override

diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java
@@ -86,7 +86,9 @@ public AbstractWindowsTerminal(Writer writer, String name, int codepage, boolean
         }
         pump = new Thread(this::pump, "WindowsStreamPump");
         pump.setDaemon(true);
-        pump.start();
+        // This is called by the JNA/Jansi terminal implementation to avoid
+        // race conditions if they do initialization in their constructor
+        //pump.start();
         closer = this::close;
         ShutdownHooks.add(closer);
     }