From: Olivier Lamy <olamy@apache.org>
Date: Mon, 2 Apr 2012 07:21:06 +0000 (+0000)
Subject: take care about using full file path on delete
X-Git-Tag: archiva-1.4-M3~884
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b730d9a8d61ffcb45b19942e7316c5d3c865f0b;p=archiva.git

take care about using full file path on delete

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
index f9ca3d0d1..95712a891 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
@@ -180,7 +180,8 @@ public class DefaultFileUploadService
     {
         File file = new File( SystemUtils.getJavaIoTmpDir(), fileName );
         log.debug( "delete file:{},exists:{}", file.getPath(), file.exists() );
-        boolean removed = getSessionFileMetadatas().remove( new FileMetadata( fileName ) );
+        boolean removed = getSessionFileMetadatas().remove(
+            new FileMetadata( SystemUtils.getJavaIoTmpDir().getPath() + "/" + fileName ) );
         if ( file.exists() )
         {
             return file.delete();
@@ -194,7 +195,7 @@ public class DefaultFileUploadService
         List<FileMetadata> fileMetadatas = new ArrayList( getSessionFileMetadatas() );
         for ( FileMetadata fileMetadata : fileMetadatas )
         {
-            deleteFile( fileMetadata.getServerFileName() );
+            deleteFile( new File( fileMetadata.getServerFileName() ).getName() );
         }
         return Boolean.TRUE;
     }