Repository: spark Updated Branches: refs/heads/branch-2.2 c6ba64793 -> d16e2620d
[SPARK-21253][CORE][HOTFIX] Fix Scala 2.10 build ## What changes were proposed in this pull request? A follow up PR to fix Scala 2.10 build for #18472 ## How was this patch tested? Jenkins Author: Shixiong Zhu <shixi...@databricks.com> Closes #18478 from zsxwing/SPARK-21253-2. (cherry picked from commit cfc696f4a4289acf132cb26baf7c02c5b6305277) Signed-off-by: Shixiong Zhu <shixi...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d16e2620 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d16e2620 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d16e2620 Branch: refs/heads/branch-2.2 Commit: d16e2620d1fc8a6b6b5c71401e5d452683fa7762 Parents: c6ba647 Author: Shixiong Zhu <shixi...@databricks.com> Authored: Thu Jun 29 20:56:37 2017 -0700 Committer: Shixiong Zhu <shixi...@databricks.com> Committed: Thu Jun 29 20:56:44 2017 -0700 ---------------------------------------------------------------------- .../org/apache/spark/network/client/TransportResponseHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d16e2620/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java ---------------------------------------------------------------------- diff --git a/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java index be9f182..340b8b9 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java @@ -92,7 +92,7 @@ public class TransportResponseHandler extends MessageHandler<ResponseMessage> { public void addStreamCallback(String streamId, StreamCallback callback) { timeOfLastRequestNs.set(System.nanoTime()); - streamCallbacks.offer(Tuple2.apply(streamId, callback)); + streamCallbacks.offer(new Tuple2<>(streamId, callback)); } @VisibleForTesting --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
