You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/03/15 00:24:37 UTC

zeppelin git commit: [HOTFIX] Code style fix for branch-0.8

Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.8 7a8400e96 -> c6485d621


[HOTFIX] Code style fix for branch-0.8

### What is this PR for?

HotFix for code style issue of branch-0.8

### What type of PR is it?
[Hot Fix]

### Todos
* [ ] - Task

### What is the Jira issue?
* No jira created

### How should this be tested?
* CI pass

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Jeff Zhang <zj...@apache.org>

Closes #2868 from zjffdu/HOTFIX_JavaDoc and squashes the following commits:

69f3fc9 [Jeff Zhang] [HOTFIX] Code sytle fix for branch-0.8


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c6485d62
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c6485d62
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c6485d62

Branch: refs/heads/branch-0.8
Commit: c6485d621a82356070f6b373c22b9d677b80c801
Parents: 7a8400e
Author: Jeff Zhang <zj...@apache.org>
Authored: Thu Mar 15 07:35:47 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Thu Mar 15 08:24:30 2018 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java   | 3 ++-
 .../src/main/java/org/apache/zeppelin/spark/ZeppelinR.java        | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6485d62/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
----------------------------------------------------------------------
diff --git a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
index 1eba9c2..f117686 100644
--- a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
+++ b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
@@ -668,7 +668,8 @@ public abstract class BaseLivyInterpreter extends Interpreter {
     } else {
       restTemplate = new RestTemplate(new HttpComponentsClientHttpRequestFactory(httpClient));
     }
-    restTemplate.getMessageConverters().add(0, new StringHttpMessageConverter(Charset.forName("UTF-8")));
+    restTemplate.getMessageConverters().add(0,
+        new StringHttpMessageConverter(Charset.forName("UTF-8")));
     return restTemplate;
   }
 

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6485d62/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java
----------------------------------------------------------------------
diff --git a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java
index e481dbe..edd3233 100644
--- a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java
+++ b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java
@@ -399,6 +399,9 @@ public class ZeppelinR implements ExecuteResultHandler {
   }
 
 
+  /**
+   * InterpreterOutptStream for SparkInterpreter, used for checking R process status
+   */
   public static class SparkRInterpreterOutputStream extends InterpreterOutputStream {
 
     private SparkRInterpreter sparkRInterpreter;