You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/06/20 00:56:42 UTC
svn commit: r1351896 -
/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
Author: olamy
Date: Tue Jun 19 22:56:42 2012
New Revision: 1351896
URL: http://svn.apache.org/viewvc?rev=1351896&view=rev
Log:
correctly update metadata after deletion
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java?rev=1351896&r1=1351895&r2=1351896&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java Tue Jun 19 22:56:42 2012
@@ -714,6 +714,15 @@ public class DefaultRepositoriesService
{
repository.deleteVersion( ref );
}
+ else
+ {
+ Set<ArtifactReference> related = repository.getRelatedArtifacts( artifactReference );
+ log.debug( "related: {}", related );
+ for ( ArtifactReference artifactRef : related )
+ {
+ repository.deleteArtifact( artifactRef );
+ }
+ }
File metadataFile = getMetadata( targetPath.getAbsolutePath() );
ArchivaRepositoryMetadata metadata = getMetadata( metadataFile );
@@ -723,16 +732,6 @@ public class DefaultRepositoriesService
metadataRepository.getArtifacts( repositoryId, artifact.getGroupId(), artifact.getArtifactId(),
artifact.getVersion() );
- if ( snapshotVersion )
- {
- Set<ArtifactReference> related = repository.getRelatedArtifacts( artifactReference );
- log.debug( "related: {}", related );
- for ( ArtifactReference artifactRef : related )
- {
- repository.deleteArtifact( artifactRef );
- }
- }
-
for ( ArtifactMetadata artifactMetadata : artifacts )
{