You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:54:49 UTC

svn commit: r1077237 - /hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FsShell.java

Author: omalley
Date: Fri Mar  4 03:54:48 2011
New Revision: 1077237

URL: http://svn.apache.org/viewvc?rev=1077237&view=rev
Log:
commit 48b90e76fa2d1e2eda9fe19f299e2e5dae27d19e
Author: Hairong Kuang <ha...@ucdev21.inktomisearch.com>
Date:   Sat Feb 27 01:44:54 2010 +0000

    revert the change made by HDFS:6569
    
    +++ b/YAHOO-CHANGES.txt

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FsShell.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FsShell.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FsShell.java?rev=1077237&r1=1077236&r2=1077237&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FsShell.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/fs/FsShell.java Fri Mar  4 03:54:48 2011
@@ -346,6 +346,9 @@ public class FsShell extends Configured 
     new DelayedExceptionThrowing() {
       @Override
       void process(Path p, FileSystem srcFs) throws IOException {
+        if (srcFs.getFileStatus(p).isDir()) {
+          throw new IOException("Source must be a file.");
+        }
         printToStdout(srcFs.open(p));
       }
     }.globAndProcess(srcPattern, getSrcFileSystem(srcPattern, verifyChecksum));