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 2015/10/07 04:52:55 UTC
[5/6] archiva git commit: ooops fix compilation
ooops fix compilation
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/b2ced491
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/b2ced491
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/b2ced491
Branch: refs/heads/master
Commit: b2ced491a9b1d7d3b446142ce743d28c1ae4d50e
Parents: a399856
Author: Olivier Lamy <ol...@apache.org>
Authored: Wed Oct 7 12:19:27 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Wed Oct 7 12:19:27 2015 +1100
----------------------------------------------------------------------
.../repository/file/FileMetadataRepository.java | 21 ++++++--------------
1 file changed, 6 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/b2ced491/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
index da3c444..2cea31c 100644
--- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
@@ -420,10 +420,7 @@ public class FileMetadataRepository
try
{
File dir = getMetadataDirectory( repositoryId, facetId );
- if ( !Files.deleteIfExists( dir.toPath() ) )
- {
- log.error( "Cannot delete the metadata repository {}", dir );
- }
+ FileUtils.deleteDirectory( dir );
}
catch ( IOException e )
{
@@ -438,10 +435,7 @@ public class FileMetadataRepository
try
{
File dir = new File( getMetadataDirectory( repoId, facetId ), name );
- if ( !Files.deleteIfExists( dir.toPath() ) )
- {
- log.error( "Cannot delete the metadata repository {}", dir );
- }
+ FileUtils.deleteDirectory( dir );
}
catch ( IOException e )
{
@@ -778,7 +772,7 @@ public class FileMetadataRepository
}
}
- Files.deleteIfExists( directory.toPath() );
+ FileUtils.deleteDirectory( directory );
//writeProperties( properties, directory, PROJECT_VERSION_METADATA_KEY );
}
catch ( IOException e )
@@ -812,10 +806,7 @@ public class FileMetadataRepository
try
{
File dir = getDirectory( repoId );
- if ( !Files.deleteIfExists( dir.toPath() ) )
- {
- log.error( "Cannot delete repository {}", dir );
- }
+ FileUtils.deleteDirectory( dir );
}
catch ( IOException e )
{
@@ -1365,7 +1356,7 @@ public class FileMetadataRepository
try
{
File directory = new File( getDirectory( repositoryId ), namespace + "/" + projectId );
- Files.deleteIfExists( directory.toPath() );
+ FileUtils.deleteDirectory( directory );
}
catch ( IOException e )
{
@@ -1380,7 +1371,7 @@ public class FileMetadataRepository
try
{
File directory = new File( getDirectory( repoId ), namespace + "/" + projectId + "/" + projectVersion );
- Files.deleteIfExists( directory.toPath() );
+ FileUtils.deleteDirectory( directory );
}
catch ( IOException e )
{