You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2022/01/06 09:51:50 UTC
[archiva] branch archiva-2.x updated: [MRM-2028] Fixing NPE on metadata removal
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch archiva-2.x
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/archiva-2.x by this push:
new 9c9762e [MRM-2028] Fixing NPE on metadata removal
9c9762e is described below
commit 9c9762e09907cf2cb2372ea508554b9fe7ba2ab7
Author: Martin Schreier <ma...@apache.org>
AuthorDate: Thu Jan 6 10:51:45 2022 +0100
[MRM-2028] Fixing NPE on metadata removal
---
.../consumers/core/repository/AbstractRepositoryPurge.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
index de2d489..6cef0cb 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
@@ -263,13 +263,11 @@ public abstract class AbstractRepositoryPurge
if ( StringUtils.isNotBlank( reference.getClassifier( ) ) )
{
info.setClassifier( reference.getClassifier( ) );
- metaRemovalList.put( info, artifactMetadata );
- }
- else
- {
- // metadataRepository.removeArtifact( artifactMetadata, baseVersion );
- metaRemovalList.put( info, artifactMetadata );
+ } else {
+ info.setClassifier( "" );
}
+ // metadataRepository.removeArtifact( artifactMetadata, baseVersion );
+ metaRemovalList.put( info, artifactMetadata );
}
}
}
@@ -349,7 +347,7 @@ public abstract class AbstractRepositoryPurge
(MavenArtifactFacet) artifactMetadata.getFacet(
MavenArtifactFacet.FACET_ID );
- if ( StringUtils.equals( artifactInfo.classifier,
+ if ( mavenArtifactFacet!= null && StringUtils.equals( artifactInfo.classifier,
mavenArtifactFacet.getClassifier( ) ) )
{
artifactMetadata.removeFacet( MavenArtifactFacet.FACET_ID );