Fix interrupt signal killing application (#958) (#973)

jline · Apr 24, 2024 · 98d3d08 · 98d3d08
1 parent 247d90b
commit 98d3d08
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -763,12 +763,17 @@ && getLastBinding().charAt(0) == originalAttributes.getControlChar(ControlChar.V
                 throw e;
             }
         } finally {
-            boolean interrupted = Thread.interrupted();
+            AtomicBoolean interrupted = new AtomicBoolean(Thread.interrupted());
             try {
                 lock.lock();
 
                 this.reading = false;
 
+                Terminal.SignalHandler tmpHandler = terminal.handle(Signal.INT, s -> interrupted.set(true));
+                if (previousIntrHandler == null) {
+                    previousIntrHandler = tmpHandler;
+                }
+
                 cleanup();
                 if (originalAttributes != null) {
                     terminal.setAttributes(originalAttributes);
@@ -785,7 +790,7 @@ && getLastBinding().charAt(0) == originalAttributes.getControlChar(ControlChar.V
             } finally {
                 lock.unlock();
                 startedReading.set(false);
-                if (interrupted) {
+                if (interrupted.get()) {
                     Thread.currentThread().interrupt();
                 }
             }