From b0d4986202bd2c91c2d6efd7fbc4c742186cc870 Mon Sep 17 00:00:00 2001 From: "Kwon, Yeong-Eon" Date: Sun, 12 Jun 2016 21:49:55 +0900 Subject: [PATCH 1/2] typo --- bin/zeppelin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/zeppelin.sh b/bin/zeppelin.sh index 92d7f7ead96..701b8901c4b 100755 --- a/bin/zeppelin.sh +++ b/bin/zeppelin.sh @@ -83,7 +83,7 @@ if [[ ! -d "${ZEPPELIN_PID_DIR}" ]]; then fi if [[ ! -d "${ZEPPELIN_NOTEBOOK_DIR}" ]]; then - echo "Pid dir doesn't exist, create ${ZEPPELIN_NOTEBOOK_DIR}" + echo "Notebook dir doesn't exist, create ${ZEPPELIN_NOTEBOOK_DIR}" $(mkdir -p "${ZEPPELIN_NOTEBOOK_DIR}") fi From 467101141266a9f9346fe5d96f4da3a45d1021b5 Mon Sep 17 00:00:00 2001 From: "Kwon, Yeong-Eon" Date: Tue, 14 Jun 2016 09:29:13 +0900 Subject: [PATCH 2/2] Prevent NullPointerException if no gatewayServer exists --- .../java/org/apache/zeppelin/python/PythonInterpreter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java b/python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java index 23aeca24802..1bd3ca40a4b 100644 --- a/python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java +++ b/python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java @@ -125,8 +125,10 @@ public void close() { logger.info("closing Python interpreter ....."); try { - process.close(); - gatewayServer.shutdown(); + if (process != null) + process.close(); + if (gatewayServer != null) + gatewayServer.shutdown(); } catch (IOException e) { logger.error("Can't close the interpreter", e); }