You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/01/21 11:56:32 UTC
svn commit: r736283 -
/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
Author: sisbell
Date: Wed Jan 21 02:56:31 2009
New Revision: 736283
URL: http://svn.apache.org/viewvc?rev=736283&view=rev
Log:
MNG-3973
Modified:
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=736283&r1=736282&r2=736283&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java Wed Jan 21 02:56:31 2009
@@ -109,7 +109,7 @@
List<DomainModel> parentModels = getParentsOfDomainModel( domainModel, mdReader );
if( parentModels == null )
- throw new DependencyProcessorException( "cannor read parent for " + bmd.getGAV() );
+ throw new DependencyProcessorException( "cannot read parent for " + bmd.getGAV() );
domainModels.addAll( parentModels );
}
@@ -136,13 +136,18 @@
}
private static List<DomainModel> getParentsOfDomainModel( MavenDomainModel domainModel, MetadataReader mdReader )
- throws IOException, MetadataReaderException
+ throws IOException, MetadataReaderException, DependencyProcessorException
{
List<DomainModel> domainModels = new ArrayList<DomainModel>();
if ( domainModel.hasParent() )
{
+ byte[] b = mdReader.readMetadata( domainModel.getParentMetadata() );
+
+ if ( b == null || b.length < 1 )
+ throw new DependencyProcessorException( "cannot read metadata for " + domainModel.getParentMetadata() );
+
MavenDomainModel parentDomainModel =
- new MavenDomainModel( mdReader.readMetadata( domainModel.getParentMetadata() ) );
+ new MavenDomainModel( b );
domainModels.add( parentDomainModel );
domainModels.addAll( getParentsOfDomainModel( parentDomainModel, mdReader ) );
}