From 0a229139bdb08bdcd0db84822b862bbfd0869dfd Mon Sep 17 00:00:00 2001
From: Jeff Zhang <zjffdu@apache.org>
Date: Wed, 14 Mar 2018 10:53:28 +0800
Subject: [PATCH] [HOTFIX] More proper error message when interpreter is not
 binded

---
 .../apache/zeppelin/interpreter/InterpreterSetting.java  | 5 +++--
 .../java/org/apache/zeppelin/notebook/Paragraph.java     | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
index ff4626d13a1..a3b7f8dd0cc 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
@@ -677,8 +677,9 @@ public void clearNoteIdAndParaMap() {
   List<Interpreter> createInterpreters(String user, String interpreterGroupId, String sessionId) {
     List<Interpreter> interpreters = new ArrayList<>();
     List<InterpreterInfo> interpreterInfos = getInterpreterInfos();
+    Properties intpProperties = getJavaProperties();
     for (InterpreterInfo info : interpreterInfos) {
-      Interpreter interpreter = new RemoteInterpreter(getJavaProperties(), sessionId,
+      Interpreter interpreter = new RemoteInterpreter(intpProperties, sessionId,
           info.getClassName(), user, lifecycleManager);
       if (info.isDefaultInterpreter()) {
         interpreters.add(0, interpreter);
@@ -688,7 +689,7 @@ List<Interpreter> createInterpreters(String user, String interpreterGroupId, Str
       LOGGER.info("Interpreter {} created for user: {}, sessionId: {}",
           interpreter.getClassName(), user, sessionId);
     }
-    interpreters.add(new ConfInterpreter(getJavaProperties(), interpreterGroupId, this));
+    interpreters.add(new ConfInterpreter(intpProperties, interpreterGroupId, this));
     return interpreters;
   }
 
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
index 23d2d4794eb..57756b8e183 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
@@ -367,14 +367,11 @@ public boolean execute(boolean blocking) {
         return true;
       }
     } catch (InterpreterNotFoundException e) {
-      String intpExceptionMsg =
-          getJobName() + "'s Interpreter " + getIntpText() + " not found";
-      RuntimeException intpException = new RuntimeException(intpExceptionMsg);
       InterpreterResult intpResult =
-          new InterpreterResult(InterpreterResult.Code.ERROR, intpException.getMessage());
-      setReturn(intpResult, intpException);
+          new InterpreterResult(InterpreterResult.Code.ERROR);
+      setReturn(intpResult, e);
       setStatus(Job.Status.ERROR);
-      throw intpException;
+      throw new RuntimeException(e);
     }
   }