svn commit: r680915 - in /maven/sandbox/trunk/mercury/src: main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java

[ogusakov]

Author: ogusakov
Date: Tue Jul 29 22:56:09 2008
New Revision: 680915

URL: http://svn.apache.org/viewvc?rev=680915&view=rev
Log:
fixed an issue with ArtifactBasicMetadata - getBaseName(classifier) was treated 
improperly 

Modified:
    
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
    
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java

Modified: 
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java?rev=680915&r1=680914&r2=680915&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
 (original)
+++ 
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
 Tue Jul 29 22:56:09 2008
@@ -149,7 +149,7 @@
   
   public String getBaseName( String classifier )
   {
-    return artifactId + "-" + version + (classifier == null ? "" 
:"-"+classifier);
+    return artifactId + "-" + version + ((classifier == 
null||classifier.length()<1) ? "" :"-"+classifier);
   }
 
   public String getCheckedType()

Modified: 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java?rev=680915&r1=680914&r2=680915&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java
 (original)
+++ 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java
 Tue Jul 29 22:56:09 2008
@@ -24,10 +24,7 @@
 implements MetadataProcessor
 {
 
-  public List<ArtifactBasicMetadata> getDependencies(
-                                      ArtifactBasicMetadata bmd
-                                      , MetadataReader mdReader
-                                                )
+  public List<ArtifactBasicMetadata> getDependencies( ArtifactBasicMetadata 
bmd, MetadataReader mdReader )
   throws MetadataProcessingException
   {
     List<ArtifactBasicMetadata> deps = null;
@@ -35,6 +32,10 @@
     try
     {
       byte [] pomBytes = mdReader.readMetadata( bmd );
+      if( pomBytes == null )
+      {
+        throw new MetadataProcessingException("no metadata found for "+bmd);
+      }
       deps = getDeps(  pomBytes );
       
       return deps;
@@ -48,6 +49,9 @@
   private static final List<ArtifactBasicMetadata> getDeps( byte [] pom )
   throws IOException, SAXException
   {
+    if( pom == null )
+      return null;
+    
     DependencyCreator dc = new DependencyCreator();
     Digester digester = new Digester();
     digester.push( dc );