svn commit: r1352873 - /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java

[olamy]

Author: olamy
Date: Fri Jun 22 13:10:41 2012
New Revision: 1352873

URL: http://svn.apache.org/viewvc?rev=1352873&view=rev
Log:
take of version when we delete a timestamped snapshot

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=1352873&r1=1352872&r2=1352873&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
 Fri Jun 22 13:10:41 2012
@@ -728,9 +728,23 @@ public class DefaultRepositoriesService
 
                 updateMetadata( metadata, metadataFile, lastUpdatedTimestamp, 
artifact );
             }
-            Collection<ArtifactMetadata> artifacts =
-                metadataRepository.getArtifacts( repositoryId, 
artifact.getGroupId(), artifact.getArtifactId(),
-                                                 artifact.getVersion() );
+            Collection<ArtifactMetadata> artifacts = Collections.emptyList();
+
+            if ( snapshotVersion )
+            {
+                String baseVersion = VersionUtil.getBaseVersion( 
artifact.getVersion() );
+                artifacts =
+                    metadataRepository.getArtifacts( repositoryId, 
artifact.getGroupId(), artifact.getArtifactId(),
+                                                     baseVersion );
+            }
+            else
+            {
+                artifacts =
+                    metadataRepository.getArtifacts( repositoryId, 
artifact.getGroupId(), artifact.getArtifactId(),
+                                                     artifact.getVersion() );
+            }
+
+            log.debug( "artifacts: {}", artifacts );
 
             for ( ArtifactMetadata artifactMetadata : artifacts )
             {
@@ -813,6 +827,7 @@ public class DefaultRepositoriesService
         }
         finally
         {
+
             repositorySession.save();
 
             repositorySession.close();