Author: szetszwo
Date: Wed Mar 26 17:49:56 2014
New Revision: 1581966
URL: http://svn.apache.org/r1581966
Log:
svn merge -c 1581964 from trunk for HADOOP-10440. HarFsInputStream.read(byte[])
updates position incorrectly.
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/
(props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
Propchange:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1581964
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1581966&r1=1581965&r2=1581966&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Mar 26 17:49:56 2014
@@ -126,6 +126,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10425. LocalFileSystem.getContentSummary should not count crc files.
(szetszwo)
+ HADOOP-10440. HarFsInputStream.read(byte[]) updates position incorrectly.
+ (guodongdong via szetszwo)
+
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
HADOOP-10185. FileSystem API for ACLs. (cnauroth)
Propchange:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1581964
Propchange:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1581964
Propchange:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1581964
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java?rev=1581966&r1=1581965&r2=1581966&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
Wed Mar 26 17:49:56 2014
@@ -963,9 +963,6 @@ public class HarFileSystem extends FileS
@Override
public synchronized int read(byte[] b) throws IOException {
final int ret = read(b, 0, b.length);
- if (ret > 0) {
- position += ret;
- }
return ret;
}
