Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 31673 invoked from network); 12 Oct 2006 15:46:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Oct 2006 15:46:17 -0000 Received: (qmail 73939 invoked by uid 500); 12 Oct 2006 15:46:16 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 73886 invoked by uid 500); 12 Oct 2006 15:46:15 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 73875 invoked by uid 500); 12 Oct 2006 15:46:15 -0000 Received: (qmail 73872 invoked by uid 99); 12 Oct 2006 15:46:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2006 08:46:15 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2006 08:46:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4403C1A981A; Thu, 12 Oct 2006 08:45:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r463287 - /ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java Date: Thu, 12 Oct 2006 15:45:54 -0000 To: ant-cvs@apache.org From: mbenson@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061012154554.4403C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mbenson Date: Thu Oct 12 08:45:53 2006 New Revision: 463287 URL: http://svn.apache.org/viewvc?view=rev&rev=463287 Log: fix failures Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java?view=diff&rev=463287&r1=463286&r2=463287 ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java Thu Oct 12 08:45:53 2006 @@ -247,6 +247,7 @@ union.setProject(getProject()); } union.add(c); + setChecked(false); } /** @@ -319,7 +320,8 @@ if (isReference()) { return ((Path) getCheckedRef()).list(); } - return union == null ? new String[0] : union.list(); + return assertFilesystemOnly(union) == null + ? new String[0] : union.list(); } /** @@ -440,7 +442,9 @@ super.dieOnCircularReference(stk, p); } else { if (union != null) { + stk.push(union); invokeCircularReferenceCheck(union, stk, p); + stk.pop(); } setChecked(true); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org