Merge pull request #1069 from amplab/revert-1061-TACHYON-575

Revert "[TACHYON-572, TACHYON-573, TACHYON-575] style fixes"
Alluxio · Jul 9, 2015 · 9033a1e · 9033a1e
2 parents 55dde59 + f5449e1
commit 9033a1e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/clients/unshaded/src/main/java/tachyon/client/BlockInStream.java b/clients/unshaded/src/main/java/tachyon/client/BlockInStream.java
@@ -39,7 +39,7 @@ public abstract class BlockInStream extends InStream {
    * @param tachyonFile the file the block belongs to
    * @param readType the InStream's read type
    * @param blockIndex the index of the block in the tachyonFile
-   * @param tachyonConf the TachyonConf instance for this file input stream.
+   * @param tachyonConf the TachyonConf instance for this file output stream.
    * @return A new LocalBlockInStream or RemoteBlockInStream
    * @throws IOException
    */
@@ -56,7 +56,6 @@ public static BlockInStream get(TachyonFile tachyonFile, ReadType readType, int
    * @param readType the InStream's read type
    * @param blockIndex the index of the block in the tachyonFile
    * @param ufsConf the under file system configuration
-   * @param tachyonConf the TachyonConf instance for this file input stream.
    * @return A new LocalBlockInStream or RemoteBlockInStream
    * @throws IOException
    */
@@ -87,7 +86,7 @@ public static BlockInStream get(TachyonFile tachyonFile, ReadType readType, int
    * @param file
    * @param readType
    * @param blockIndex
-   * @param tachyonConf the TachyonConf instance for this file input stream.
+   * @param tachyonConf the TachyonConf instance for this file output stream.
    * @throws IOException
    */
   BlockInStream(TachyonFile file, ReadType readType, int blockIndex, TachyonConf tachyonConf)

diff --git a/clients/unshaded/src/main/java/tachyon/client/BlockOutStream.java b/clients/unshaded/src/main/java/tachyon/client/BlockOutStream.java
@@ -110,13 +110,6 @@ public class BlockOutStream extends OutStream {
     mBuffer = ByteBuffer.allocate(Ints.checkedCast(allocateBytes));
   }
 
-  /**
-   * Write out the buffer to the mapped file, will automatically request more space
-   * if the block cannot hold the buffer anymore
-   * @param buf the buffer to write out
-   * @param offset the starting offset of the buffer
-   * @param length number of bytes to write
-   */
   private synchronized void appendCurrentBuffer(byte[] buf, int offset, int length)
       throws IOException {
     if (mAvailableBytes < length) {

diff --git a/common/src/main/java/tachyon/network/NettyUtils.java b/common/src/main/java/tachyon/network/NettyUtils.java
@@ -36,7 +36,7 @@ private NettyUtils() {}
    * Creates a Netty EventLoopGroup based on the IOMode.
    *
    * @param type Selector for which form of low-level IO we should use
-   * @param numThreads the number of EventLoops to use for this instance
+   * @param numThreads
    * @param threadPrefix name pattern for each thread. should contain '%d' to distinguish between
    *        threads.
    * @param isDaemon if true, the {@link java.util.concurrent.ThreadFactory} will create