You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/05/15 23:18:47 UTC

svn commit: r1483087 - /maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java

Author: rfscholte
Date: Wed May 15 21:18:47 2013
New Revision: 1483087

URL: http://svn.apache.org/r1483087
Log:
Create MavenXpp3Reader only once per methodcall
Close FileReader at end

Modified:
    maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java

Modified: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java?rev=1483087&r1=1483086&r2=1483087&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java (original)
+++ maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java Wed May 15 21:18:47 2013
@@ -15,6 +15,7 @@ import org.apache.maven.model.io.xpp3.Ma
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.MavenProjectHelper;
+import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /*
@@ -113,6 +114,8 @@ public final class ProjectUtils
             return false;
         }
 
+        MavenXpp3Reader reader = new MavenXpp3Reader();
+        
         for ( String module : modules )
         {
             File moduleFile = new File( project.getBasedir(), module );
@@ -122,11 +125,13 @@ public final class ProjectUtils
                 moduleFile = new File( moduleFile, "pom.xml" );
             }
 
-            MavenXpp3Reader reader = new MavenXpp3Reader();
+            FileReader moduleReader = null; 
             
             try
             {
-                Model model = reader.read( new FileReader( moduleFile ) );
+                moduleReader = new FileReader( moduleFile );
+                
+                Model model = reader.read( moduleReader );
                 
                 if ( model.getParent() != null && model.getParent().getId().equals( project.getId() ) )
                 {
@@ -148,6 +153,10 @@ public final class ProjectUtils
                 // TODO Auto-generated catch block
                 e.printStackTrace();
             }
+            finally
+            {
+                IOUtil.close( moduleReader );
+            }
             
         }
         return true;