fix synchronizatio bug and stream position bug in HdfsFileInputStream

WangTaoTheTonic · Dec 29, 2014 · 5bd78fb · 5bd78fb
1 parent 12dfb49
commit 5bd78fb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/src/main/java/tachyon/hadoop/HdfsFileInputStream.java b/core/src/main/java/tachyon/hadoop/HdfsFileInputStream.java
@@ -163,7 +163,8 @@ public int read(byte[] b, int off, int len) throws IOException {
    * number of bytes read. This does not change the current offset of a file, and is thread-safe.
    */
   @Override
-  public int read(long position, byte[] buffer, int offset, int length) throws IOException {
+  public synchronized int read(long position, byte[] buffer, int offset, int length)
+      throws IOException {
     int ret = -1;
     long oldPos = getPos();
     if ((position < 0) || (position >= mTachyonFile.length())) {
@@ -174,6 +175,7 @@ public int read(long position, byte[] buffer, int offset, int length) throws IOE
       try {
         seek(position);
         ret = mTachyonFileInputStream.read(buffer, offset, length);
+        mCurrentPosition += ret;
         return ret;
       } finally {
         seek(oldPos);
@@ -184,6 +186,7 @@ public int read(long position, byte[] buffer, int offset, int length) throws IOE
       try {
         mHdfsInputStream.seek(position);
         ret = mHdfsInputStream.read(buffer, offset, length);
+        mCurrentPosition += ret;
         return ret;
       } finally {
         mHdfsInputStream.seek(oldPos);