o Updated to stop suppressing exceptions incorrectly when closing resources.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1750430 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java b/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
index 097b0aa..c5ef72c 100644
--- a/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
@@ -236,6 +236,12 @@
IOUtil.copy( pomInputStream, pomOutputStream );
+ pomOutputStream.close();
+ pomOutputStream = null;
+
+ pomInputStream.close();
+ pomInputStream = null;
+
processModel( readModel( pomFile ) );
break;
@@ -395,7 +401,10 @@
try
{
reader = ReaderFactory.newXmlReader( pomFile );
- return new MavenXpp3Reader().read( reader );
+ final Model model = new MavenXpp3Reader().read( reader );
+ reader.close();
+ reader = null;
+ return model;
}
catch ( FileNotFoundException e )
{
@@ -513,6 +522,8 @@
writer = WriterFactory.newXmlWriter( pomFile );
new MavenXpp3Writer().write( writer, model );
+ writer.close();
+ writer = null;
return pomFile;
}
diff --git a/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java b/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
index 7518fc1..fcae808 100644
--- a/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
+++ b/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
@@ -19,28 +19,23 @@
* under the License.
*/
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.File;
+import java.io.Reader;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.utils.ReaderFactory;
import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.shared.utils.io.IOUtil;
-import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.impl.internal.EnhancedLocalRepositoryManager;
import org.sonatype.aether.util.DefaultRepositorySystemSession;
-import java.io.File;
-import java.io.Reader;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
@@ -177,6 +172,8 @@
{
reader = ReaderFactory.newXmlReader( installedPom );
model = new MavenXpp3Reader().read( reader );
+ reader.close();
+ reader = null;
}
finally
{
