You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by be...@apache.org on 2011/02/17 12:16:51 UTC

svn commit: r1071576 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java

Author: bentmann
Date: Thu Feb 17 11:16:51 2011
New Revision: 1071576

URL: http://svn.apache.org/viewvc?rev=1071576&view=rev
Log:
o Fixed file handle leak

Modified:
    maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java

Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=1071576&r1=1071575&r2=1071576&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java Thu Feb 17 11:16:51 2011
@@ -26,6 +26,7 @@ import org.apache.maven.plugin.war.Overl
 import org.apache.maven.plugin.war.util.PathSet;
 import org.apache.maven.shared.filtering.MavenFilteringException;
 import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.XmlStreamReader;
 
@@ -291,7 +292,14 @@ public class WarProjectPackagingTask
         throws IOException
     {
         XmlStreamReader xmlReader = new XmlStreamReader( webXml );
-        return xmlReader.getEncoding();
+        try
+        {
+            return xmlReader.getEncoding();
+        }
+        finally
+        {
+            IOUtil.close( xmlReader );
+        }
     }
 
     /**