Merge "Fix a couple of FileChannel bugs." into dalvik-dev

2 files changed, 4 insertions, 1 deletions

diff --git a/luni/src/main/java/java/nio/FileChannelImpl.java b/luni/src/main/java/java/nio/FileChannelImpl.java
index 379c99f..53c1e4d 100644
--- a/luni/src/main/java/java/nio/FileChannelImpl.java
+++ b/luni/src/main/java/java/nio/FileChannelImpl.java
@@ -297,6 +297,9 @@ final class FileChannelImpl extends FileChannel {
                 begin();
                 try {
                     bytesRead = Libcore.os.read(fd, buffer);
+                    if (bytesRead == 0) {
+                        bytesRead = -1;
+                    }
                 } catch (ErrnoException errnoException) {
                     if (errnoException.errno == EAGAIN) {
                         // We don't throw if we try to read from an empty non-blocking pipe.
diff --git a/luni/src/main/java/java/nio/IoVec.java b/luni/src/main/java/java/nio/IoVec.java
index 948e658..e548548 100644
--- a/luni/src/main/java/java/nio/IoVec.java
+++ b/luni/src/main/java/java/nio/IoVec.java
@@ -92,7 +92,7 @@ final class IoVec {
                 b.position(b.limit());
                 byteCount -= byteCounts[i];
             } else {
-                b.position((direction == Direction.WRITEV ? b.position() : 0) + byteCounts[i]);
+                b.position((direction == Direction.WRITEV ? b.position() : 0) + byteCount);
                 byteCount = 0;
             }
         }