From 2077b3e8cfc1a53069c2e84d8ef275d04cadaff5 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 3 Nov 2012 02:34:18 +0000 Subject: [PATCH] closed streams git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1405265 13f79535-47bb-0310-9956-ffa450edef68 --- .../plugin/generator/PluginHelpGenerator.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java index 985bc60..9aeeeeb 100644 --- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java +++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java @@ -189,13 +189,20 @@ public class PluginHelpGenerator properties.put( "artifactId", pluginDescriptor.getArtifactId() ); properties.put( "goalPrefix", pluginDescriptor.getGoalPrefix() ); - // FIXME encoding ! - StringWriter stringWriter = new StringWriter(); InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( "help-class-source.vm" ); - InputStreamReader isReader = new InputStreamReader( is ); // FIXME platform encoding - velocityComponent.getEngine().evaluate( context, stringWriter, "", isReader ); // FIXME close reader + InputStreamReader isReader = null; + try + { + isReader = new InputStreamReader( is ); // FIXME platform encoding + velocityComponent.getEngine().evaluate( context, stringWriter, "", isReader ); + } + finally + { + IOUtil.close( is ); + IOUtil.close( isReader ); + } return stringWriter.toString(); }