From c87a62187b5777bb96a4e974de9bdf159d7ddf9b Mon Sep 17 00:00:00 2001 From: evenisse Date: Fri, 15 Oct 2004 14:49:17 +0000 Subject: [PATCH] MPJCOVERAGE-17. Fixed leaking file handles. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116144 13f79535-47bb-0310-9956-ffa450edef68 --- jcoverage/project.xml | 2 +- .../apache/maven/jcoveragereport/CoverageReport.java | 3 ++- .../jcoveragereport/CoverageReportGenerator.java | 12 ++++++++++-- jcoverage/xdocs/changes.xml | 3 +++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/jcoverage/project.xml b/jcoverage/project.xml index 12febe46..2a3d6ad3 100644 --- a/jcoverage/project.xml +++ b/jcoverage/project.xml @@ -23,7 +23,7 @@ 3 maven-jcoverage-plugin Maven JCoverage plugin - 1.0.8 + 1.0.9-SNAPSHOT org.apache.maven.jcoveragereport This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool. This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool. diff --git a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java index 63c662b4..6c70443f 100644 --- a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java +++ b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java @@ -33,7 +33,7 @@ import org.apache.oro.text.perl.Perl5Util; /** * @author Emmanuel Venisse - * @version $Id: CoverageReport.java,v 1.10 2004/07/06 16:06:46 evenisse Exp $ + * @version $Id: CoverageReport.java,v 1.11 2004/10/15 14:49:17 evenisse Exp $ */ public class CoverageReport { @@ -436,6 +436,7 @@ public class CoverageReport pw.println(generateFooter()); pw.println(""); pw.println(""); + br.close(); pw.close(); } diff --git a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java index 71b43ff5..9b47b8ae 100644 --- a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java +++ b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java @@ -25,7 +25,7 @@ import java.io.PrintWriter; /** * @author Emmanuel Venisse - * @version $Id: CoverageReportGenerator.java,v 1.4 2004/03/31 22:55:19 evenisse Exp $ + * @version $Id: CoverageReportGenerator.java,v 1.5 2004/10/15 14:49:17 evenisse Exp $ */ public class CoverageReportGenerator { @@ -56,10 +56,11 @@ public class CoverageReportGenerator { System.out.println("Generate report for " + dataFile + " file."); System.out.println("OutputDir = " + outputDir); + FileReader fr = null; try { prepareFile(); - FileReader fr = new FileReader(dataFile); + fr = new FileReader(dataFile); CoverageUnmarshaller cum = new CoverageUnmarshaller(); Coverage coverage = cum.parse(fr); @@ -70,6 +71,13 @@ public class CoverageReportGenerator { e.printStackTrace(); } + finally + { + if (fr != null) + { + fr.close(); + } + } } /* diff --git a/jcoverage/xdocs/changes.xml b/jcoverage/xdocs/changes.xml index 5df2f297..26e181a3 100644 --- a/jcoverage/xdocs/changes.xml +++ b/jcoverage/xdocs/changes.xml @@ -24,6 +24,9 @@ Emmanuel Venisse + + Fixed leaking file handles. + Fixed overview and packages rates. Add the possibility to set multiple includes and excludes files for instrumentation.