svn commit: r471359 - /maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java

[jvanzyl]

Author: jvanzyl
Date: Sat Nov  4 20:21:19 2006
New Revision: 471359

URL: http://svn.apache.org/viewvc?view=rev&rev=471359
Log:
MRM-220 Guard against null groupIds in metadata during conversion of legacy 
repositories

Modified:
    
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java

Modified: 
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java?view=diff&rev=471359&r1=471358&r2=471359
==============================================================================
--- 
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
 (original)
+++ 
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
 Sat Nov  4 20:21:19 2006
@@ -294,14 +294,14 @@
 
         boolean result = true;
 
-        if ( !metadata.getGroupId().equals( artifact.getGroupId() ) )
+        if ( metadata.getGroupId() == null || !metadata.getGroupId().equals( 
artifact.getGroupId() ) )
         {
             addFailure( reporter, artifact, groupIdKey );
             result = false;
         }
         if ( !repositoryMetadata.storedInGroupDirectory() )
         {
-            if ( !metadata.getArtifactId().equals( artifact.getArtifactId() ) )
+            if ( metadata.getGroupId() == null || 
!metadata.getArtifactId().equals( artifact.getArtifactId() ) )
             {
                 addFailure( reporter, artifact, artifactIdKey );
                 result = false;