Fix some reflections

Leemoonsoo · lresende · commit 112ae7d13a36 · 2016-07-11T13:36:53.000-07:00
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java
@@ -177,7 +177,7 @@ private void createIMain() {
                                  getProperty("zeppelin.dep.additionalRemoteRepository"));
     if (isScala2_10()) {
       completor = instantiateClass(
-          "SparkJLineCompletion",
+          "org.apache.spark.repl.SparkJLineCompletion",
           new Class[]{findClass("org.apache.spark.repl.SparkIMain")},
           new Object[]{intp});
     }
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -608,7 +608,12 @@ public void open() {
               Integer.parseInt(getProperty("zeppelin.spark.maxResult")));
 
       interpret("@transient val _binder = new java.util.HashMap[String, Object]()");
-      binder = (Map<String, Object>) getLastObject();
+      Map<String, Object> binder;
+      if (isScala2_10()) {
+        binder = (Map<String, Object>) getValue("_binder");
+      } else {
+        binder = (Map<String, Object>) getLastObject();
+      }
       binder.put("sc", sc);
       binder.put("sqlc", sqlc);
       binder.put("z", z);

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ private void createIMain() {`
`177`	`177`	`getProperty("zeppelin.dep.additionalRemoteRepository"));`
`178`	`178`	`if (isScala2_10()) {`
`179`	`179`	`completor = instantiateClass(`
`180`		`- "SparkJLineCompletion",`
	`180`	`+ "org.apache.spark.repl.SparkJLineCompletion",`
`181`	`181`	`new Class[]{findClass("org.apache.spark.repl.SparkIMain")},`
`182`	`182`	`new Object[]{intp});`
`183`	`183`	`}`