Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 30290 invoked from network); 6 Oct 2008 16:15:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Oct 2008 16:15:30 -0000 Received: (qmail 76377 invoked by uid 500); 6 Oct 2008 16:15:28 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 76360 invoked by uid 500); 6 Oct 2008 16:15:28 -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 76351 invoked by uid 99); 6 Oct 2008 16:15:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2008 09:15:28 -0700 X-ASF-Spam-Status: No, hits=-1999.9 required=10.0 tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE 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; Mon, 06 Oct 2008 16:14:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3F14723888D5; Mon, 6 Oct 2008 09:15:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r702188 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java src/tests/antunit/taskdefs/optional/depend/depend-test.xml Date: Mon, 06 Oct 2008 16:15:08 -0000 To: notifications@ant.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081006161509.3F14723888D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Mon Oct 6 09:15:08 2008 New Revision: 702188 URL: http://svn.apache.org/viewvc?rev=702188&view=rev Log: make sure closes JARs. PR 45955. Modified: ant/core/trunk/WHATSNEW ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=702188&r1=702187&r2=702188&view=diff ============================================================================== --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Mon Oct 6 09:15:08 2008 @@ -229,6 +229,9 @@ * could miss multi-character begin tokens in some cases. Bugzilla Report 45094. + * didn't close JARs that were part of the classpath. + Bugzilla Report 45955. + Other changes: -------------- Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java?rev=702188&r1=702187&r2=702188&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java Mon Oct 6 09:15:08 2008 @@ -26,6 +26,7 @@ import java.util.Vector; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.depend.AbstractAnalyzer; /** @@ -96,9 +97,7 @@ analyzedDeps.put(dependency, dependency); } } finally { - if (inStream != null) { - inStream.close(); - } + FileUtils.close(inStream); if (zipFile != null) { zipFile.close(); } Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java?rev=702188&r1=702187&r2=702188&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java Mon Oct 6 09:15:08 2008 @@ -201,9 +201,7 @@ } } } finally { - if (in != null) { - in.close(); - } + FileUtils.close(in); } return dependencyMap; @@ -238,9 +236,7 @@ } } } finally { - if (pw != null) { - pw.close(); - } + FileUtils.close(pw); } } } @@ -373,7 +369,9 @@ if (checkPath != null) { // now determine which jars each class depends upon classpathDependencies = new Hashtable(); - AntClassLoader loader = getProject().createClassLoader(checkPath); + AntClassLoader loader = null; + try { + loader = getProject().createClassLoader(checkPath); Hashtable classpathFileCache = new Hashtable(); Object nullFileMarker = new Object(); @@ -426,6 +424,11 @@ } } } + } finally { + if (loader != null) { + loader.cleanup(); + } + } } // write the dependency cache to the disk Modified: ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml?rev=702188&r1=702187&r2=702188&view=diff ============================================================================== --- ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml (original) +++ ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml Mon Oct 6 09:15:08 2008 @@ -61,6 +61,7 @@ +