Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 7724 invoked from network); 12 Dec 2006 14:50:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Dec 2006 14:50:00 -0000 Received: (qmail 35440 invoked by uid 500); 12 Dec 2006 14:50:07 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 35408 invoked by uid 500); 12 Dec 2006 14:50:07 -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 35393 invoked by uid 500); 12 Dec 2006 14:50:07 -0000 Received: (qmail 35388 invoked by uid 99); 12 Dec 2006 14:50:07 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 06:50:07 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 06:49:58 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 5082E1A981C; Tue, 12 Dec 2006 06:49:14 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r486168 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java Date: Tue, 12 Dec 2006 14:49:14 -0000 To: ant-cvs@apache.org From: kevj@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061212144914.5082E1A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kevj Date: Tue Dec 12 06:49:13 2006 New Revision: 486168 URL: http://svn.apache.org/viewvc?view=rev&rev=486168 Log: -fix as suggested by DD, should now compile on pre java6 rt.jar Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java?view=diff&rev=486168&r1=486167&r2=486168 ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java Tue Dec 12 06:49:13 2006 @@ -18,6 +18,8 @@ package org.apache.tools.ant.taskdefs.condition; +import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.JavaEnvUtils; import org.apache.tools.ant.util.ReflectWrapper; @@ -39,9 +41,9 @@ try { if (JavaEnvUtils.isAtLeastJavaVersion("1.6")) { //reflection to avoid bootstrap/build problems - String j6FileUtils = "org.apache.tools.ant.util.java16.Java6FileUtils"; - ReflectWrapper w = new ReflectWrapper(getClass().getClassLoader(), j6FileUtils); - long free = ((Long)w.invoke("freeSpace", String.class, partition)).longValue(); + File fs = new File(partition); + ReflectWrapper w = new ReflectWrapper(fs); + long free = ((Long)w.invoke("getFreeSpace")).longValue(); return free >= StringUtils.parseHumanSizes(needed); } else { throw new BuildException("HasFreeSpace condition not supported on Java5 or less."); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org