You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/06/20 11:42:33 UTC
svn commit: r1604116 -
/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Author: hboutemy
Date: Fri Jun 20 09:42:32 2014
New Revision: 1604116
URL: http://svn.apache.org/r1604116
Log:
[DOXIATOOLS-44] don't forget to close readers
Modified:
maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1604116&r1=1604115&r2=1604116&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Fri Jun 20 09:42:32 2014
@@ -1158,12 +1158,13 @@ public class DefaultSiteTool
String siteDescriptorContent = null;
long siteDescriptorLastModified = 0L;
+ Reader siteDescriptorReader = null;
try
{
if ( siteDescriptor != null && siteDescriptor.exists() )
{
getLogger().debug( "Reading site descriptor from " + siteDescriptor );
- Reader siteDescriptorReader = ReaderFactory.newXmlReader( siteDescriptor );
+ siteDescriptorReader = ReaderFactory.newXmlReader( siteDescriptor );
siteDescriptorContent = IOUtil.toString( siteDescriptorReader );
siteDescriptorLastModified = siteDescriptor.lastModified();
}
@@ -1172,6 +1173,10 @@ public class DefaultSiteTool
{
throw new SiteToolException( "The site descriptor cannot be read!", e );
}
+ finally
+ {
+ IOUtil.close( siteDescriptorReader );
+ }
DecorationModel decoration = null;
if ( siteDescriptorContent != null )