Skip to content

Commit 05bc521

Browse files
authored
Merge pull request #1356 from ligangty/metadata
Mark as deleted even if the metadata not existed in store for metadata merging
2 parents c02cdad + b7296d7 commit 05bc521

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/change/MetadataMergePomChangeListener.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private void metaClear( final FileEvent event )
138138
catch ( final IndyDataException e )
139139
{
140140
logger.warn( "Failed to regenerate maven-metadata.xml for artifacts after deployment to: {}"
141-
+ "\nCannot retrieve associated groups: {}", e, key, e.getMessage() );
141+
+ "\nCannot retrieve associated groups: {}", key, e.getMessage() );
142142
}
143143
}
144144

@@ -181,6 +181,15 @@ private boolean doClear( final ArtifactStore store, final String path )
181181
fileEvent.fire( new FileDeletionEvent( item, new EventMetadata() ) );
182182
}
183183
}
184+
else if ( item.getPath().endsWith( MavenMetadataMerger.METADATA_NAME ) )
185+
{
186+
// we should return true here to trigger cache cleaning, because file not exists in store does not mean
187+
// metadata not exists in cache.
188+
logger.debug(
189+
"Metadata clean for {}: metadata not existed in store, so skipped deletion and mark as deleted",
190+
item );
191+
return true;
192+
}
184193
}
185194
return isCleared;
186195
}

0 commit comments

Comments
 (0)