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

HADOOP-9473. Merge 1467694 and 1467696 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467697 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-04-13 20:27:50 +00:00
parent a59b953861
commit 5a98de170c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,8 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9211. Set default max heap size in HADOOP_CLIENT_OPTS to 512m HADOOP-9211. Set default max heap size in HADOOP_CLIENT_OPTS to 512m
in order to avoid OOME. (Plamen Jeliazkov via shv) in order to avoid OOME. (Plamen Jeliazkov via shv)
HADOOP-9473. Typo in FileUtil copy() method. (Glen Mazza via suresh)
Release 2.0.4-alpha - UNRELEASED Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
View File

@ -263,7 +263,7 @@ public class FileUtil {
// Check if dest is directory // Check if dest is directory
if (!dstFS.exists(dst)) { if (!dstFS.exists(dst)) {
throw new IOException("`" + dst +"': specified destination directory " + throw new IOException("`" + dst +"': specified destination directory " +
"doest not exist"); "does not exist");
} else { } else {
FileStatus sdst = dstFS.getFileStatus(dst); FileStatus sdst = dstFS.getFileStatus(dst);
if (!sdst.isDirectory()) if (!sdst.isDirectory())