From 247ec2b571f8adb3c9675c222db5bf082a9557e9 Mon Sep 17 00:00:00 2001
From: Qifan Pu <qifan.pu@gmail.com>
Date: Wed, 15 Jul 2015 12:44:21 -0700
Subject: [PATCH] Fix codestyle errors.

---
 .../java/tachyon/client/RemoteBlockInStream.java     | 12 ++++++------
 .../tachyon/client/netty/NettyRemoteBlockReader.java |  2 +-
 .../network/protocol/RPCBlockReadResponse.java       |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/clients/unshaded/src/main/java/tachyon/client/RemoteBlockInStream.java b/clients/unshaded/src/main/java/tachyon/client/RemoteBlockInStream.java
index 8a8fb4b5e4a5..cea4bd22dccb 100644
--- a/clients/unshaded/src/main/java/tachyon/client/RemoteBlockInStream.java
+++ b/clients/unshaded/src/main/java/tachyon/client/RemoteBlockInStream.java
@@ -106,7 +106,7 @@ public class RemoteBlockInStream extends BlockInStream {
   private static final int MAX_REMOTE_READ_ATTEMPTS = 2;
 
   /** A reference to the current reader so we can clear it after reading is finished. */
-  private static RemoteBlockReader mUnclearedReader = null;
+  private static RemoteBlockReader sUnclearedReader = null;
 
   /**
    * @param file the file the block belongs to
@@ -317,7 +317,7 @@ private static ByteBuffer retrieveByteBufferFromRemoteMachine(InetSocketAddress
     RemoteBlockReader reader = RemoteBlockReader.Factory.createRemoteBlockReader(conf);
     // always clear the previous reader before assigning it to a new one
     clearReader();
-    mUnclearedReader = reader;
+    sUnclearedReader = reader;
     return reader.readRemoteBlock(
         address.getHostName(), address.getPort(), blockId, offset, length);
   }
@@ -430,11 +430,11 @@ private boolean updateCurrentBuffer() throws IOException {
    */
   private static boolean clearReader() {
     boolean res = true;
-    if (mUnclearedReader != null) {
-      if (mUnclearedReader instanceof NettyRemoteBlockReader) {
-        return ((NettyRemoteBlockReader) mUnclearedReader).clearReadResponse();
+    if (sUnclearedReader != null) {
+      if (sUnclearedReader instanceof NettyRemoteBlockReader) {
+        return ((NettyRemoteBlockReader) sUnclearedReader).clearReadResponse();
       }
-      mUnclearedReader = null;
+      sUnclearedReader = null;
     }
     return res;
   }
diff --git a/clients/unshaded/src/main/java/tachyon/client/netty/NettyRemoteBlockReader.java b/clients/unshaded/src/main/java/tachyon/client/netty/NettyRemoteBlockReader.java
index 3f2d12bd8b77..a581f1c24761 100644
--- a/clients/unshaded/src/main/java/tachyon/client/netty/NettyRemoteBlockReader.java
+++ b/clients/unshaded/src/main/java/tachyon/client/netty/NettyRemoteBlockReader.java
@@ -26,6 +26,7 @@
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
+
 import tachyon.Constants;
 import tachyon.client.RemoteBlockReader;
 import tachyon.network.protocol.RPCBlockReadRequest;
@@ -33,7 +34,6 @@
 import tachyon.network.protocol.RPCErrorResponse;
 import tachyon.network.protocol.RPCMessage;
 import tachyon.network.protocol.RPCResponse;
-import tachyon.network.protocol.databuffer.DataByteBuffer;
 
 /**
  * Read data from remote data server using Netty.
diff --git a/common/src/main/java/tachyon/network/protocol/RPCBlockReadResponse.java b/common/src/main/java/tachyon/network/protocol/RPCBlockReadResponse.java
index 3c6c1fea7a54..2990b27df4a0 100644
--- a/common/src/main/java/tachyon/network/protocol/RPCBlockReadResponse.java
+++ b/common/src/main/java/tachyon/network/protocol/RPCBlockReadResponse.java
@@ -20,6 +20,7 @@
 import com.google.common.primitives.Shorts;
 
 import io.netty.buffer.ByteBuf;
+
 import tachyon.network.protocol.databuffer.DataBuffer;
 import tachyon.network.protocol.databuffer.DataNettyBuffer;