You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/12/31 23:31:46 UTC
[3/5] git commit: Remove import * and fix some formatting
Remove import * and fix some formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/9115a5de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/9115a5de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/9115a5de
Branch: refs/heads/master
Commit: 9115a5de62dcb832569727773112a4688ef63f03
Parents: 040dd3e
Author: Binh Nguyen <ng...@gmail.com>
Authored: Sat Dec 7 09:15:31 2013 -0800
Committer: Binh Nguyen <ng...@gmail.com>
Committed: Tue Dec 24 14:59:30 2013 -0800
----------------------------------------------------------------------
.../main/java/org/apache/spark/network/netty/FileClient.java | 4 ++--
.../main/java/org/apache/spark/network/netty/FileServer.java | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9115a5de/core/src/main/java/org/apache/spark/network/netty/FileClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/spark/network/netty/FileClient.java b/core/src/main/java/org/apache/spark/network/netty/FileClient.java
index 95e25d9..6b7f6a9 100644
--- a/core/src/main/java/org/apache/spark/network/netty/FileClient.java
+++ b/core/src/main/java/org/apache/spark/network/netty/FileClient.java
@@ -20,10 +20,10 @@ package org.apache.spark.network.netty;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
import io.netty.channel.oio.OioEventLoopGroup;
import io.netty.channel.socket.oio.OioSocketChannel;
-import io.netty.util.concurrent.EventExecutorGroup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,7 +83,7 @@ class FileClient {
channel = null;
}
- if (group!=null) {
+ if (group != null) {
group.shutdownGracefully();
group = null;
bootstrap = null;
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9115a5de/core/src/main/java/org/apache/spark/network/netty/FileServer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/spark/network/netty/FileServer.java b/core/src/main/java/org/apache/spark/network/netty/FileServer.java
index a7305cd..3fe7d69 100644
--- a/core/src/main/java/org/apache/spark/network/netty/FileServer.java
+++ b/core/src/main/java/org/apache/spark/network/netty/FileServer.java
@@ -17,20 +17,17 @@
package org.apache.spark.network.netty;
-import java.net.InetSocketAddress;
-
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoop;
-import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.oio.OioEventLoopGroup;
import io.netty.channel.socket.oio.OioServerSocketChannel;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.net.InetSocketAddress;
+
/**
* Server that accept the path of a file an echo back its content.