Handle JLine's UserInterruptException

src/main/java/org/springframework/shell/Bootstrap.java

@@ -91,6 +91,7 @@ public Bootstrap(String[] args, String[] contextPath) {
 			scanner.scan("org.springframework.shell.commands", "org.springframework.shell.converters",
 					"org.springframework.shell.plugin.support");
 		}
+		scanner.scan("org.springframework.shell.config");
 		// user contributed commands
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(ctx);
 		reader.loadBeanDefinitions(contextPath);
@@ -140,6 +141,8 @@ private void setupLogging() {
 
 	public ExitShellRequest run() {
 		StopWatch sw = new StopWatch("Spring Shell");
+		sw.start();
+
 		String[] commandsToExecuteAndThenQuit = commandLine.getShellCommandsToExecute();
 		// The shell is used
 		JLineShellComponent shell = ctx.getBean("shell", JLineShellComponent.class);

src/main/java/org/springframework/shell/config/ApplicationContextProvider.java

@@ -0,0 +1,24 @@
+package org.springframework.shell.config;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author nmeierling
+ */
+@Component
+public class ApplicationContextProvider implements ApplicationContextAware {
+
+    private static ApplicationContext applicationContext;
+
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext ctx) throws BeansException {
+        applicationContext = ctx;
+    }
+}

src/main/java/org/springframework/shell/config/JLineConfig.java

@@ -0,0 +1,20 @@
+package org.springframework.shell.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+
+/**
+ * @author nmeierling
+ */
+@Configuration
+@PropertySource("classpath:application.properties")
+public class JLineConfig {
+    @Autowired
+    Environment env;
+
+    public boolean isHandleUserInterrupt() {
+        return Boolean.parseBoolean(env.getProperty("jline.handleuserinterrupt"));
+    }
+}

src/main/java/org/springframework/shell/core/JLineShell.java

@@ -40,6 +40,7 @@
 
 import jline.WindowsTerminal;
 import jline.console.ConsoleReader;
+import jline.console.UserInterruptException;
 import jline.console.history.History;
 import jline.console.history.MemoryHistory;
 
@@ -49,6 +50,8 @@
 import org.fusesource.jansi.Ansi.Color;
 import org.fusesource.jansi.Ansi.Erase;
 import org.fusesource.jansi.AnsiConsole;
+import org.springframework.shell.config.ApplicationContextProvider;
+import org.springframework.shell.config.JLineConfig;
 import org.springframework.shell.event.ShellStatus;
 import org.springframework.shell.event.ShellStatus.Status;
 import org.springframework.shell.event.ShellStatusListener;
@@ -126,6 +129,11 @@ public void run() {
 			reader.setBellEnabled(false);
 		}
 
+		final JLineConfig config = ApplicationContextProvider.getApplicationContext().getBean(JLineConfig.class);
+		if (config.isHandleUserInterrupt()){
+			reader.setHandleUserInterrupt(true);
+		}
+
 		// reader.setDebug(new PrintWriter(new FileWriter("writer.debug", true)));
 
 		openFileLogIfPossible();
@@ -540,6 +548,9 @@ public void promptLoop() {
 		catch (IOException ioe) {
 			throw new IllegalStateException("Shell line reading failure", ioe);
 		}
+		catch (UserInterruptException e){ // only thrown if jline.handleuserinterrupt=true
+			promptLoop();
+		}
 		setShellStatus(Status.SHUTTING_DOWN);
 	}