Fix int signal #140

jline · Jan 8, 2018 · 7df08fb · 7df08fb
1 parent fc908f3
commit 7df08fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractTerminal.java
@@ -10,6 +10,7 @@
 
 import java.io.IOError;
 import java.io.IOException;
+import java.io.InterruptedIOException;
 import java.nio.charset.Charset;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -205,4 +206,9 @@ public MouseEvent readMouseEvent(IntSupplier reader) {
         return lastMouseEvent = MouseSupport.readMouse(reader, lastMouseEvent);
     }
 
+    protected void checkInterrupted() throws InterruptedIOException {
+        if (Thread.interrupted()) {
+            throw new InterruptedIOException();
+        }
+    }
 }
diff --git a/terminal/src/main/java/org/jline/terminal/impl/PosixPtyTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/PosixPtyTerminal.java
@@ -121,6 +121,7 @@ class PosixInputStream extends NonBlockingInputStream {
 
         @Override
         public int read(long timeout, boolean isPeek) throws IOException {
+            checkInterrupted();
             if (c != 0) {
                 int r = c;
                 if (!isPeek) {
@@ -138,6 +139,7 @@ public int read(long timeout, boolean isPeek) throws IOException {
                         }
                         return r;
                     }
+                    checkInterrupted();
                     long cur = System.currentTimeMillis();
                     if (timeout > 0 && cur - start > timeout) {
                         return NonBlockingInputStream.READ_EXPIRED;

diff --git a/terminal/src/main/java/org/jline/terminal/impl/PosixSysTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/PosixSysTerminal.java
@@ -134,6 +134,7 @@ class PosixInputStream extends NonBlockingInputStream {
 
         @Override
         public int read(long timeout, boolean isPeek) throws IOException {
+            checkInterrupted();
             if (c != 0) {
                 int r = c;
                 if (!isPeek) {
@@ -151,6 +152,7 @@ public int read(long timeout, boolean isPeek) throws IOException {
                         }
                         return r;
                     }
+                    checkInterrupted();
                     long cur = System.currentTimeMillis();
                     if (timeout > 0 && cur - start > timeout) {
                         return NonBlockingInputStream.READ_EXPIRED;