You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2017/01/31 23:48:38 UTC
[6/6] incubator-toree git commit: [quick fix]: return result for
methods of unit return type
[quick fix]: return result for methods of unit return type
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/a0440207
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/a0440207
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/a0440207
Branch: refs/heads/sandbox
Commit: a0440207c91c3783dfb754a2df87328ed288a1a2
Parents: dffc325
Author: Luciano Resende <lr...@apache.org>
Authored: Tue Jan 31 15:48:23 2017 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Tue Jan 31 15:48:23 2017 -0800
----------------------------------------------------------------------
.../protocol/v5/handler/ExecuteRequestHandler.scala | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a0440207/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala
index 8060b41..7c25bf2 100644
--- a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala
+++ b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandler.scala
@@ -91,13 +91,13 @@ class ExecuteRequestHandler(
relayMsg(executeReplyMsg, relayActor)
// Send an ExecuteResult with the result of the code execution
- if (executeResult.hasContent) {
- val executeResultMsg = skeletonBuilder
- .withIds(Seq(MessageType.Outgoing.ExecuteResult.toString))
- .withHeader(MessageType.Outgoing.ExecuteResult)
- .withContentString(executeResult).build
- relayMsg(executeResultMsg, relayActor)
- }
+ // if (executeResult.hasContent) {
+ val executeResultMsg = skeletonBuilder
+ .withIds(Seq(MessageType.Outgoing.ExecuteResult.toString))
+ .withHeader(MessageType.Outgoing.ExecuteResult)
+ .withContentString(executeResult).build
+ relayMsg(executeResultMsg, relayActor)
+ // }
case Failure(error: Throwable) =>
// Send an ExecuteReplyError to the client on the Shell socket