Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 35597 invoked from network); 4 Mar 2011 21:42:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 21:42:50 -0000 Received: (qmail 57102 invoked by uid 500); 4 Mar 2011 21:42:50 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 57072 invoked by uid 500); 4 Mar 2011 21:42:50 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 57062 invoked by uid 99); 4 Mar 2011 21:42:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 21:42:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 21:42:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6A8CB23888EA; Fri, 4 Mar 2011 21:42:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1078149 - in /hadoop/common/branches/branch-0.22: CHANGES.txt src/java/org/apache/hadoop/fs/FsShell.java Date: Fri, 04 Mar 2011 21:42:29 -0000 To: common-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304214229.6A8CB23888EA@eris.apache.org> Author: szetszwo Date: Fri Mar 4 21:42:29 2011 New Revision: 1078149 URL: http://svn.apache.org/viewvc?rev=1078149&view=rev Log: HADOOP-7162. Rmove a duplicated call FileSystem.listStatus(..) in FsShell. Contributed by Alexey Diomin Modified: hadoop/common/branches/branch-0.22/CHANGES.txt hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FsShell.java Modified: hadoop/common/branches/branch-0.22/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1078149&r1=1078148&r2=1078149&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.22/CHANGES.txt Fri Mar 4 21:42:29 2011 @@ -460,6 +460,9 @@ Release 0.21.1 - Unreleased HADOOP-7120. Fix a syntax error in test-patch.sh. (szetszwo) + HADOOP-7162. Rmove a duplicated call FileSystem.listStatus(..) in FsShell. + (Alexey Diomin via szetszwo) + Release 0.21.0 - 2010-08-13 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FsShell.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FsShell.java?rev=1078149&r1=1078148&r2=1078149&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FsShell.java (original) +++ hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FsShell.java Fri Mar 4 21:42:29 2011 @@ -550,7 +550,7 @@ public class FsShell extends Configured setFileReplication(src, srcFs, newRep, waitingList); return; } - FileStatus items[] = srcFs.listStatus(src); + FileStatus items[]; try { items = srcFs.listStatus(src); } catch (FileNotFoundException fnfe) {