Return-Path: X-Original-To: apmail-hadoop-common-dev-archive@www.apache.org Delivered-To: apmail-hadoop-common-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71A966BAA for ; Sun, 26 Jun 2011 05:20:32 +0000 (UTC) Received: (qmail 3260 invoked by uid 500); 26 Jun 2011 05:20:27 -0000 Delivered-To: apmail-hadoop-common-dev-archive@hadoop.apache.org Received: (qmail 2517 invoked by uid 500); 26 Jun 2011 05:20:13 -0000 Mailing-List: contact common-dev-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-dev@hadoop.apache.org Received: (qmail 2476 invoked by uid 99); 26 Jun 2011 05:20:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Jun 2011 05:20:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.116] (HELO hel.zones.apache.org) (140.211.11.116) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Jun 2011 05:20:07 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [140.211.11.116]) by hel.zones.apache.org (Postfix) with ESMTP id E4CC1431107 for ; Sun, 26 Jun 2011 05:19:47 +0000 (UTC) Date: Sun, 26 Jun 2011 05:19:47 +0000 (UTC) From: "Aaron T. Myers (JIRA)" To: common-dev@hadoop.apache.org Message-ID: <1877230590.41108.1309065587934.JavaMail.tomcat@hel.zones.apache.org> In-Reply-To: <669810108.8410.1297360857966.JavaMail.tomcat@hel.zones.apache.org> Subject: [jira] [Resolved] (HADOOP-7135) Commit 949660 broke FileUtil.copyMerge MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/HADOOP-7135?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Aaron T. Myers resolved HADOOP-7135. ------------------------------------ Resolution: Invalid Assignee: Jim Plush Thanks a lot for the investigation, Jim. Closing this out. > Commit 949660 broke FileUtil.copyMerge > -------------------------------------- > > Key: HADOOP-7135 > URL: https://issues.apache.org/jira/browse/HADOOP-7135 > Project: Hadoop Common > Issue Type: Bug > Components: fs > Affects Versions: 0.21.0 > Reporter: Jeffrey Gerard > Assignee: Jim Plush > Original Estimate: 5m > Remaining Estimate: 5m > > Looking at http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/fs/FileUtil.java?r1=949659&r2=949660& > it seems this commit broke FileUtil.copyMerge by omitting NOT operator. copyMerge only makes sense if srcDir is a directory. > Should be > if (!srcFS.getFileStatus(srcDir).isDirectory()) > return false; -- This message is automatically generated by JIRA. For more information on JIRA, see: http://www.atlassian.com/software/jira