Updated Branches: refs/heads/master ff21286ee -> 66dc8c6ec
code simplification Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/66dc8c6e Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/66dc8c6e Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/66dc8c6e Branch: refs/heads/master Commit: 66dc8c6ec1125436f502366942da622ee7f8f0f9 Parents: ff21286 Author: Hervé Boutemy <hbout...@apache.org> Authored: Fri Jan 18 00:44:02 2013 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Fri Jan 18 00:44:02 2013 +0100 ---------------------------------------------------------------------- .../internal/DefaultVersionRangeResolver.java | 47 +++++---------- .../internal/DefaultVersionResolver.java | 2 +- 2 files changed, 16 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/66dc8c6e/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java index c5b85f7..26dca40 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java @@ -19,7 +19,6 @@ package org.apache.maven.repository.internal; * under the License. */ -import java.io.FileInputStream; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -27,10 +26,8 @@ import java.util.List; import java.util.Map; import org.apache.maven.artifact.repository.metadata.Versioning; -import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.util.IOUtil; import org.sonatype.aether.RepositoryEvent.EventType; import org.sonatype.aether.RepositorySystemSession; import org.sonatype.aether.RequestTrace; @@ -244,39 +241,25 @@ public class DefaultVersionRangeResolver { Versioning versioning = null; - FileInputStream fis = null; - try + if ( metadata != null ) { - if ( metadata != null ) - { - SyncContext syncContext = syncContextFactory.newInstance( session, true ); + SyncContext syncContext = syncContextFactory.newInstance( session, true ); - try - { - syncContext.acquire( null, Collections.singleton( metadata ) ); + try + { + syncContext.acquire( null, Collections.singleton( metadata ) ); - if ( metadata.getFile() != null && metadata.getFile().exists() ) - { - fis = new FileInputStream( metadata.getFile() ); - org.apache.maven.artifact.repository.metadata.Metadata m = - new MetadataXpp3Reader().read( fis, false ); - versioning = m.getVersioning(); - } - } - finally - { - syncContext.release(); - } + versioning = DefaultVersionResolver.readMavenRepositoryMetadataVersioning( metadata.getFile() ); + } + catch ( Exception e ) + { + invalidMetadata( session, trace, metadata, repository, e ); + result.addException( e ); + } + finally + { + syncContext.release(); } - } - catch ( Exception e ) - { - invalidMetadata( session, trace, metadata, repository, e ); - result.addException( e ); - } - finally - { - IOUtil.close( fis ); } return ( versioning != null ) ? versioning : new Versioning(); http://git-wip-us.apache.org/repos/asf/maven/blob/66dc8c6e/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java index eca718e..daed903 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java @@ -365,7 +365,7 @@ public class DefaultVersionResolver return ( versioning != null ) ? versioning : new Versioning(); } - private Versioning readMavenRepositoryMetadataVersioning( File metadataFile ) + static Versioning readMavenRepositoryMetadataVersioning( File metadataFile ) throws IOException, XmlPullParserException { if ( metadataFile == null ||! metadataFile.exists() )
