Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1581964 from trunk for HADOOP-10440. HarFsInputStream.read(byte[]) updates position incorrectly. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581965 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2014-03-26 17:48:52 +00:00
parent e034eb46d8
commit 3e9e036099
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -153,6 +153,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10425. LocalFileSystem.getContentSummary should not count crc files. HADOOP-10425. LocalFileSystem.getContentSummary should not count crc files.
(szetszwo) (szetszwo)
HADOOP-10440. HarFsInputStream.read(byte[]) updates position incorrectly.
(guodongdong via szetszwo)
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
HADOOP-10185. FileSystem API for ACLs. (cnauroth) HADOOP-10185. FileSystem API for ACLs. (cnauroth)

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
View File

@ -963,9 +963,6 @@ public class HarFileSystem extends FileSystem {
@Override @Override
public synchronized int read(byte[] b) throws IOException { public synchronized int read(byte[] b) throws IOException {
final int ret = read(b, 0, b.length); final int ret = read(b, 0, b.length);
if (ret > 0) {
position += ret;
}
return ret; return ret;
} }