svn merge -c 1078148 from trunk for HADOOP-7162.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1125592 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -420,6 +420,9 @@ Release 0.21.1 - Unreleased
     HADOOP-7053. wrong FSNamesystem Audit logging setting in 
     conf/log4j.properties. (Jingguo Yao via eli)
 
+    HADOOP-7162. Rmove a duplicated call FileSystem.listStatus(..) in FsShell.
+    (Alexey Diomin via szetszwo)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

src/java/org/apache/hadoop/fs/FsShell.java

@@ -550,7 +550,7 @@ public class FsShell extends Configured implements Tool {
       setFileReplication(src, srcFs, newRep, waitingList);
       return;
     }
-    FileStatus items[] = srcFs.listStatus(src);
+    FileStatus items[];
     try {
       items = srcFs.listStatus(src);
     } catch (FileNotFoundException fnfe) {