From 9115a5de62dcb832569727773112a4688ef63f03 Mon Sep 17 00:00:00 2001
From: Binh Nguyen <ngbinh@gmail.com>
Date: Sat, 7 Dec 2013 09:15:31 -0800
Subject: Remove import * and fix some formatting

---
 core/src/main/java/org/apache/spark/network/netty/FileClient.java | 4 ++--
 core/src/main/java/org/apache/spark/network/netty/FileServer.java | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

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 95e25d94e6..6b7f6a9397 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;
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 a7305cda88..3fe7d69925 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.
-- 
cgit v1.2.3