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/04/02 09:21:07 UTC
svn commit: r1308259 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
Author: olamy
Date: Mon Apr 2 07:21:06 2012
New Revision: 1308259
URL: http://svn.apache.org/viewvc?rev=1308259&view=rev
Log:
take care about using full file path on delete
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java?rev=1308259&r1=1308258&r2=1308259&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java Mon Apr 2 07:21:06 2012
@@ -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;
}