From b3f540d354c4a4e2f2199019a2b880a373699560 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 6 Jun 2024 04:43:36 +0000
Subject: [PATCH] 8332921: Ctrl+C does not call shutdown hooks after JLine
 upgrade

Reviewed-by: asotona, vromero
---
 .../classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java  | 1 +
 .../classes/jdk/internal/jshell/tool/ConsoleIOContext.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
index c565c83f893..f40b9662625 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -164,6 +164,7 @@ public class JdkConsoleProviderImpl implements JdkConsoleProvider {
             try {
                 Terminal terminal = TerminalBuilder.builder().encoding(charset)
                                                    .exec(false)
+                                                   .nativeSignals(false)
                                                    .systemOutput(SystemOutput.SysOut)
                                                    .build();
                 newDelegate = new JdkConsoleImpl(terminal);
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
index 06effa3083c..2812dc19695 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
@@ -158,7 +158,7 @@ class ConsoleIOContext extends IOContext {
             terminal = TerminalBuilder.builder().inputStreamWrapper(in -> {
                 input.setInputStream(in);
                 return nonBlockingInput;
-            }).build();
+            }).nativeSignals(false).build();
             useComplexDeprecationHighlight = !OSUtils.IS_WINDOWS;
         }
         this.allowIncompleteInputs = allowIncompleteInputs;