hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whe...@apache.org
Subject svn commit: r1574261 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/shell/Ls.java
Date Wed, 05 Mar 2014 00:01:18 GMT
Author: wheat9
Date: Wed Mar  5 00:01:17 2014
New Revision: 1574261

URL: http://svn.apache.org/r1574261
Log:
HADOOP-8691. FsShell can print "Found xxx items" unnecessarily often. Contributed By Daryn
Sharp.

Modified:
    hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1574261&r1=1574260&r2=1574261&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Mar  5 00:01:17
2014
@@ -358,6 +358,9 @@ Release 2.4.0 - UNRELEASED
     HADOOP-10314. The ls command help still shows outdated 0.16 format.
     (Rushabh S Shah via kihwal)
 
+    HADOOP-8691. FsShell can print "Found xxx items" unnecessarily often.
+    (Daryn Sharp via wheat9)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java?rev=1574261&r1=1574260&r2=1574261&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
Wed Mar  5 00:01:17 2014
@@ -104,7 +104,7 @@ class Ls extends FsCommand {
   @Override
   protected void processPaths(PathData parent, PathData ... items)
   throws IOException {
-    if (!isRecursive() && items.length != 0) {
+    if (parent != null && !isRecursive() && items.length != 0) {
       out.println("Found " + items.length + " items");
     }
     adjustColumnWidths(items);



Mime
View raw message