Author: suresh
Date: Fri May 24 00:42:28 2013
New Revision: 1485907
URL: http://svn.apache.org/r1485907
Log:
HADOP-8662. Merge r1455637 for HADOOP-9388, r1455956 for HDFS-4593, r1456060
for HDFS-4582 and r1457057 for HDFS-4603
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1485907&r1=1485906&r2=1485907&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Fri May 24 00:42:28 2013
@@ -315,6 +315,11 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9364. PathData#expandAsGlob does not return correct results for
absolute paths on Windows. (Ivan Mitic via suresh)
+ HADOOP-8973. DiskChecker cannot reliably detect an inaccessible disk on
+ Windows with NTFS ACLs. (Chris Nauroth via suresh)
+
+ HADOOP-9388. TestFsShellCopy fails on Windows. (Ivan Mitic via suresh)
+
Release 2.0.4-beta - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java?rev=1485907&r1=1485906&r2=1485907&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
Fri May 24 00:42:28 2013
@@ -18,7 +18,6 @@
package org.apache.hadoop.fs.shell;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
@@ -235,7 +234,13 @@ abstract class CommandWithDestination ex
*/
protected void copyFileToTarget(PathData src, PathData target) throws
IOException {
src.fs.setVerifyChecksum(verifyChecksum);
- copyStreamToTarget(src.fs.open(src.path), target);
+ InputStream in = null;
+ try {
+ in = src.fs.open(src.path);
+ copyStreamToTarget(in, target);
+ } finally {
+ IOUtils.closeStream(in);
+ }
if(preserve) {
target.fs.setTimes(
target.path,
