[archiva] branch master updated: [MRM-2028] Fixing NPE on artifact removal

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/master by this push:
     new 512ff10  [MRM-2028] Fixing NPE on artifact removal
512ff10 is described below

commit 512ff100d7404ab55f22042a625487dfa5913405
Author: Martin Schreier <marti...@apache.org>
AuthorDate: Thu Jan 6 11:35:36 2022 +0100

    [MRM-2028] Fixing NPE on artifact removal
---
 .../archiva/consumers/core/repository/AbstractRepositoryPurge.java | 7 +++----
 1 file changed, 3 insertions(+), 4 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 d16e911..a0e984a 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
@@ -254,13 +254,12 @@ public abstract class AbstractRepositoryPurge
                                 if ( StringUtils.isNotBlank( 
reference.getClassifier( ) ) )
                                 {
                                     info.setClassifier( 
reference.getClassifier( ) );
-                                    metaRemovalList.put( info, 
artifactMetadata );
                                 }
                                 else
                                 {
-                                    // 
metadataRepository.removeTimestampedArtifact( artifactMetadata, baseVersion );
-                                    metaRemovalList.put( info, 
artifactMetadata );
+                                    info.setClassifier( "" );
                                 }
+                                metaRemovalList.put( info, artifactMetadata );
                             }
                         }
                     }
@@ -356,7 +355,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 );