Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 28022 invoked from network); 8 Apr 2011 16:24:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Apr 2011 16:24:44 -0000 Received: (qmail 82705 invoked by uid 500); 8 Apr 2011 16:24:41 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 82661 invoked by uid 500); 8 Apr 2011 16:24:41 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 82629 invoked by uid 99); 8 Apr 2011 16:24:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Apr 2011 16:24:41 +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, 08 Apr 2011 16:24:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5FD4423889EC; Fri, 8 Apr 2011 16:24:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1090325 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/types/resources/FileResource.java Date: Fri, 08 Apr 2011 16:24:20 -0000 To: notifications@ant.apache.org From: mbenson@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110408162420.5FD4423889EC@eris.apache.org> Author: mbenson Date: Fri Apr 8 16:24:19 2011 New Revision: 1090325 URL: http://svn.apache.org/viewvc?rev=1090325&view=rev Log: fix fileResource specified using basedir/name attributes Modified: ant/core/trunk/WHATSNEW ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1090325&r1=1090324&r2=1090325&view=diff ============================================================================== --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Fri Apr 8 16:24:19 2011 @@ -32,6 +32,8 @@ Fixed bugs: * Read on System.in hangs for forked java task. Bugzilla Report 50960. + * FileResource specified using basedir/name attributes was non-functional. + Other changes: -------------- Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java?rev=1090325&r1=1090324&r2=1090325&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java Fri Apr 8 16:24:19 2011 @@ -108,6 +108,16 @@ public class FileResource extends Resour return ((FileResource) getCheckedRef()).getFile(); } dieOnCircularReference(); + synchronized (this) { + if (file == null) { + //try to resolve file set via basedir/name property setters: + File d = getBaseDir(); + String n = super.getName(); + if (n != null) { + setFile(FILE_UTILS.resolveFile(d, n)); + } + } + } return file; }