Author: omalley
Date: Mon Jun 30 11:49:11 2008
New Revision: 672862
URL: http://svn.apache.org/viewvc?rev=672862&view=rev
Log:
HADOOP-3640. Fix the read method in the NativeS3InputStream. Contributed by
Tom White.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=672862&r1=672861&r2=672862&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Jun 30 11:49:11 2008
@@ -53,6 +53,9 @@
HADOOP-3563. Refactor the distributed upgrade code so that it is
easier to identify datanode and namenode related code. (dhruba)
+ HADOOP-3640. Fix the read method in the NativeS3InputStream. (tomwhite via
+ omalley)
+
Release 0.18.0 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java?rev=672862&r1=672861&r2=672862&view=diff
==============================================================================
---
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
(original)
+++
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
Mon Jun 30 11:49:11 2008
@@ -87,8 +87,8 @@
public synchronized int read() throws IOException {
int result = in.read();
- if (result > 0) {
- pos += result;
+ if (result != -1) {
+ pos++;
}
return result;
}
