[geode] branch develop updated: GEODE-6112: Improve robustness for SIGINT handling

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5eca360  GEODE-6112: Improve robustness for SIGINT handling
5eca360 is described below

commit 5eca360b9fc7e637457d60a65091f1a036135a06
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Fri Jan 25 05:59:17 2019 -0800

    GEODE-6112: Improve robustness for SIGINT handling
    
    - A NPE was being thrown when trying to Ctrl-C a process running `gfsh start
      locator`. i.e. a non-interactive gfsh session.
---
 .../management/internal/cli/shell/unsafe/GfshSignalHandler.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
index 1e08a32..d95c976 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
@@ -67,9 +67,10 @@ public class GfshSignalHandler extends AbstractSignalNotificationHandler impleme
     final Signal signal = Signal.valueOfName(sig.getName());
     switch (signal) {
       case SIGINT:
-        String prompt = consoleReader.getPrompt();
-        consoleReader.resetPromptLine(prompt, "", -1);
-
+        if (consoleReader != null) {
+          String prompt = consoleReader.getPrompt();
+          consoleReader.resetPromptLine(prompt, "", -1);
+        }
         break;
       default:
         final SignalHandler handler = getOriginalSignalHandler(signal);