You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2014/07/17 21:21:01 UTC
git commit: SPARK-1478.2 Fix incorrect NioServerSocketChannelFactory
constructor call
Repository: spark
Updated Branches:
refs/heads/master d988d345d -> 1fcd5dcdd
SPARK-1478.2 Fix incorrect NioServerSocketChannelFactory constructor call
The line break inadvertently means this was interpreted as a call to the no-arg constructor. This doesn't exist in older Netty even. (Also fixed a val name typo.)
Author: Sean Owen <sr...@gmail.com>
Closes #1466 from srowen/SPARK-1478.2 and squashes the following commits:
59c3501 [Sean Owen] Line break caused Scala to interpret NioServerSocketChannelFactory constructor as the no-arg version, which is not even present in some versions of Netty
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1fcd5dcd
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1fcd5dcd
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1fcd5dcd
Branch: refs/heads/master
Commit: 1fcd5dcdd8edb0e6989278c95e7f2c7d86c4efb2
Parents: d988d34
Author: Sean Owen <sr...@gmail.com>
Authored: Thu Jul 17 12:20:48 2014 -0700
Committer: Tathagata Das <ta...@gmail.com>
Committed: Thu Jul 17 12:20:48 2014 -0700
----------------------------------------------------------------------
.../apache/spark/streaming/flume/FlumeInputDStream.scala | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1fcd5dcd/external/flume/src/main/scala/org/apache/spark/streaming/flume/FlumeInputDStream.scala
----------------------------------------------------------------------
diff --git a/external/flume/src/main/scala/org/apache/spark/streaming/flume/FlumeInputDStream.scala b/external/flume/src/main/scala/org/apache/spark/streaming/flume/FlumeInputDStream.scala
index 07ae88f..56d2886 100644
--- a/external/flume/src/main/scala/org/apache/spark/streaming/flume/FlumeInputDStream.scala
+++ b/external/flume/src/main/scala/org/apache/spark/streaming/flume/FlumeInputDStream.scala
@@ -153,15 +153,15 @@ class FlumeReceiver(
private def initServer() = {
if (enableDecompression) {
- val channelFactory = new NioServerSocketChannelFactory
- (Executors.newCachedThreadPool(), Executors.newCachedThreadPool());
- val channelPipelieFactory = new CompressionChannelPipelineFactory()
+ val channelFactory = new NioServerSocketChannelFactory(Executors.newCachedThreadPool(),
+ Executors.newCachedThreadPool())
+ val channelPipelineFactory = new CompressionChannelPipelineFactory()
new NettyServer(
responder,
new InetSocketAddress(host, port),
- channelFactory,
- channelPipelieFactory,
+ channelFactory,
+ channelPipelineFactory,
null)
} else {
new NettyServer(responder, new InetSocketAddress(host, port))