From: Olivier Lamy <olamy@apache.org>
Date: Thu, 16 Jan 2014 00:00:17 +0000 (+0000)
Subject: fix issue when deleting project version non snapshot
X-Git-Tag: archiva-2.0.0-RC1~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=28c5e2e323d74761b5fcf56ba03e7326fc389711;p=archiva.git

fix issue when deleting project version non snapshot

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1558620 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index 2adb32dea..b9935199b 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -610,6 +610,7 @@ public class DefaultRepositoriesService
         {
             Artifact artifact = new Artifact( namespace, projectId, version );
             artifact.setRepositoryId( repositoryId );
+            artifact.setContext( repositoryId );
             return deleteArtifact( artifact );
         }
 
@@ -711,6 +712,12 @@ public class DefaultRepositoriesService
     {
 
         String repositoryId = artifact.getContext();
+        // some rest call can use context or repositoryId
+        // so try both!!
+        if ( StringUtils.isEmpty( repositoryId ) )
+        {
+            repositoryId = artifact.getRepositoryId();
+        }
         if ( StringUtils.isEmpty( repositoryId ) )
         {
             throw new ArchivaRestServiceException( "repositoryId cannot be null", 400, null );