Author: olamy
Date: Fri Oct 19 23:16:50 2012
New Revision: 1400336
URL: http://svn.apache.org/viewvc?rev=1400336&view=rev
Log:
add null check as mock can return null
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java?rev=1400336&r1=1400335&r2=1400336&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
Fri Oct 19 23:16:50 2012
@@ -120,40 +120,45 @@ public abstract class AbstractRepository
Collection<ArtifactMetadata> artifacts =
metadataRepository.getArtifacts(
repository.getId(), reference.getGroupId(),
reference.getArtifactId(), baseVersion );
- // cleanup snapshots metadata
- for ( ArtifactMetadata artifactMetadata : artifacts )
+ if ( artifacts != null )
{
-
- // TODO: mismatch between artifact (snapshot)
version and project (base) version here
- if ( artifactMetadata.getVersion().equals(
reference.getVersion() ) )
+ // cleanup snapshots metadata
+ for ( ArtifactMetadata artifactMetadata :
artifacts )
{
- if ( StringUtils.isNotBlank(
reference.getClassifier() ) )
+
+ // TODO: mismatch between artifact (snapshot)
version and project (base) version here
+ if ( artifactMetadata.getVersion().equals(
reference.getVersion() ) )
{
+ if ( StringUtils.isNotBlank(
reference.getClassifier() ) )
+ {
- // cleanup facet which contains classifier
information
- MavenArtifactFacet mavenArtifactFacet =
- (MavenArtifactFacet)
artifactMetadata.getFacet( MavenArtifactFacet.FACET_ID );
+ // cleanup facet which contains
classifier information
+ MavenArtifactFacet mavenArtifactFacet =
+ (MavenArtifactFacet)
artifactMetadata.getFacet(
+ MavenArtifactFacet.FACET_ID );
+
+ if ( StringUtils.equals(
reference.getClassifier(),
+
mavenArtifactFacet.getClassifier() ) )
+ {
+ artifactMetadata.removeFacet(
MavenArtifactFacet.FACET_ID );
+ String groupId =
reference.getGroupId(), artifactId =
+ reference.getArtifactId(),
+ version =
reference.getVersion();
+ MavenArtifactFacet
mavenArtifactFacetToCompare = new MavenArtifactFacet();
+
mavenArtifactFacetToCompare.setClassifier( reference.getClassifier() );
+ metadataRepository.removeArtifact(
repository.getId(), groupId, artifactId,
+
version, mavenArtifactFacetToCompare );
+ metadataRepository.save();
+ }
- if ( StringUtils.equals(
reference.getClassifier(),
-
mavenArtifactFacet.getClassifier() ) )
+ }
+ else
{
- artifactMetadata.removeFacet(
MavenArtifactFacet.FACET_ID );
- String groupId =
reference.getGroupId(), artifactId = reference.getArtifactId(),
- version = reference.getVersion();
- MavenArtifactFacet
mavenArtifactFacetToCompare = new MavenArtifactFacet();
-
mavenArtifactFacetToCompare.setClassifier( reference.getClassifier() );
- metadataRepository.removeArtifact(
repository.getId(), groupId, artifactId,
-
version, mavenArtifactFacetToCompare );
- metadataRepository.save();
+ metadataRepository.removeArtifact(
artifactMetadata, VersionUtil.getBaseVersion(
+ reference.getVersion() ) );
}
}
- else
- {
- metadataRepository.removeArtifact(
artifactMetadata, VersionUtil.getBaseVersion(
- reference.getVersion() ) );
- }
-
}
}
}
