summaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-04-02 07:21:06 +0000
committerOlivier Lamy <olamy@apache.org>2012-04-02 07:21:06 +0000
commit2b730d9a8d61ffcb45b19942e7316c5d3c865f0b (patch)
treef9846a22ed7988a2f940a80d1f8a4eade22a6daf /archiva-modules
parentc3ee919adca4bd3278ee6d80b0d06b0115844297 (diff)
downloadarchiva-2b730d9a8d61ffcb45b19942e7316c5d3c865f0b.tar.gz
archiva-2b730d9a8d61ffcb45b19942e7316c5d3c865f0b.zip
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
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java5
1 files changed, 3 insertions, 2 deletions
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;
}