You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/10/03 23:40:18 UTC

svn commit: r581732 - /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

Author: jvanzyl
Date: Wed Oct  3 14:40:17 2007
New Revision: 581732

URL: http://svn.apache.org/viewvc?rev=581732&view=rev
Log:
o applying patch to allow to read the model with a reader
Submitted by: Eugene Kuleshov

Modified:
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=581732&r1=581731&r2=581732&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Wed Oct  3 14:40:17 2007
@@ -206,22 +206,24 @@
     }
 
     public Model readModel( File file )
-        throws XmlPullParserException, IOException
+    throws XmlPullParserException, IOException
     {
-        Reader reader = new FileReader( file );
+    	Reader reader = new FileReader( file );
+    	
+    	try
+    	{
+    		return readModel( reader );
+    	}
+    	finally
+    	{
+    		IOUtil.close( reader );
+    	}
+    }
 
-        Model model;
-
-        try
-        {
-            model = modelReader.read( reader );
-        }
-        finally
-        {
-            IOUtil.close( reader );
-        }
-
-        return model;
+    public Model readModel( Reader reader )
+    throws XmlPullParserException, IOException
+    {
+    	return modelReader.read( reader );
     }
 
     public void writeModel( Writer writer,