From 6826ebde9fd45e9ba0b515e02059aaecf700bd59 Mon Sep 17 00:00:00 2001
From: DuyHai DOAN <doanduyhai@gmail.com>
Date: Tue, 30 Jun 2015 13:06:14 +0200
Subject: [PATCH 1/2] Fix issue raised by ZEPPELIN-127 related to DisplayUtils

---
 .../org/apache/zeppelin/spark/SparkInterpreter.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
index aec6d16d55a..36fe19c8a4e 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -466,17 +466,18 @@ public void open() {
       intp.interpret("import sqlContext.sql");
       intp.interpret("import org.apache.spark.sql.functions._");
     }
-
-    /* Temporary disabling DisplayUtils. see https://issues.apache.org/jira/browse/ZEPPELIN-127
-     *
+    
     // Utility functions for display
     intp.interpret("import org.apache.zeppelin.spark.utils.DisplayUtils._");
 
     // Scala implicit value for spark.maxResult
     intp.interpret("import org.apache.zeppelin.spark.utils.SparkMaxResult");
-    intp.interpret("implicit val sparkMaxResult = new SparkMaxResult(" +
-            Integer.parseInt(getProperty("zeppelin.spark.maxResult")) + ")");
-     */
+    intp.interpret("object MaxResult {" +
+        "implicit val sparkMaxResult = new SparkMaxResult(" +
+        Integer.parseInt(getProperty("zeppelin.spark.maxResult")) + ")" +
+        "}");
+    intp.interpret("import MaxResult.sparkMaxResult");
+
 
     try {
       if (sc.version().startsWith("1.1") || sc.version().startsWith("1.2")) {

From 0f88e2defb618927670a29ed24e12a557a6c7d4c Mon Sep 17 00:00:00 2001
From: DuyHai DOAN <doanduyhai@gmail.com>
Date: Fri, 31 Jul 2015 15:37:31 +0200
Subject: [PATCH 2/2] Make MaxResult object serializable to avoid any potential
 ser/deser issue

---
 spark/pom.xml                                                   | 1 -
 .../main/java/org/apache/zeppelin/spark/SparkInterpreter.java   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/spark/pom.xml b/spark/pom.xml
index 9b82acbedd5..c0a9958278a 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -15,7 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
index 36fe19c8a4e..ca954b99b6d 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -472,7 +472,7 @@ public void open() {
 
     // Scala implicit value for spark.maxResult
     intp.interpret("import org.apache.zeppelin.spark.utils.SparkMaxResult");
-    intp.interpret("object MaxResult {" +
+    intp.interpret("object MaxResult extends Serializable {" +
         "implicit val sparkMaxResult = new SparkMaxResult(" +
         Integer.parseInt(getProperty("zeppelin.spark.maxResult")) + ")" +
         "}");