From 1fcd5dcdd8edb0e6989278c95e7f2c7d86c4efb2 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Thu, 17 Jul 2014 12:20:48 -0700
Subject: [PATCH] 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 <srowen@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
---
.../spark/streaming/flume/FlumeInputDStream.scala | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 07ae88febf..56d2886b26 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))
--
GitLab