Author: schulte
Date: Tue Jun 28 01:01:11 2016
New Revision: 1750430
URL: http://svn.apache.org/viewvc?rev=1750430&view=rev
Log:
o Updated to stop suppressing exceptions incorrectly when closing resources.
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=1750430&r1=1750429&r2=1750430&view=diff
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Tue Jun 28 01:01:11 2016
@@ -236,6 +236,12 @@ public class InstallFileMojo
IOUtil.copy( pomInputStream, pomOutputStream );
+ pomOutputStream.close();
+ pomOutputStream = null;
+
+ pomInputStream.close();
+ pomInputStream = null;
+
processModel( readModel( pomFile ) );
break;
@@ -395,7 +401,10 @@ public class InstallFileMojo
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 @@ public class InstallFileMojo
writer = WriterFactory.newXmlWriter( pomFile );
new MavenXpp3Writer().write( writer, model );
+ writer.close();
+ writer = null;
return pomFile;
}
Modified:
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java?rev=1750430&r1=1750429&r2=1750430&view=diff
==============================================================================
---
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
Tue Jun 28 01:01:11 2016
@@ -19,28 +19,23 @@ package org.apache.maven.plugin.install;
* 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:arami...@apache.org";>Allan Ramirez</a>
@@ -177,6 +172,8 @@ public class InstallFileMojoTest
{
reader = ReaderFactory.newXmlReader( installedPom );
model = new MavenXpp3Reader().read( reader );
+ reader.close();
+ reader = null;
}
finally
{
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java?rev=1750430&r1=1750429&r2=1750430&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Tue Jun 28 01:01:11 2016
@@ -66,6 +66,8 @@ public abstract class ProjectInfoProject
{
reader = ReaderFactory.newXmlReader( new File( getBasedir(),
getPOM() ) );
model = pomReader.read( reader );
+ reader.close();
+ reader = null;
setModel( model );
}
catch ( Exception e )
