Repository: archiva Updated Branches: refs/heads/master 7fba33c0b -> 9a09994c8
simply use File implementation as we are now 1.7 required Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/9a09994c Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/9a09994c Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/9a09994c Branch: refs/heads/master Commit: 9a09994c8cf6a47a0edf9dda434f3b8cf4140e12 Parents: 7fba33c Author: Olivier Lamy <[email protected]> Authored: Tue Apr 22 12:02:32 2014 +1000 Committer: Olivier Lamy <[email protected]> Committed: Tue Apr 22 12:02:32 2014 +1000 ---------------------------------------------------------------------- .../common/filelock/DefaultFileLockManager.java | 27 +------------------- 1 file changed, 1 insertion(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/9a09994c/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java b/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java index 583d3b8..ee4fb35 100644 --- a/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java +++ b/archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java @@ -276,32 +276,7 @@ public class DefaultFileLockManager private boolean mkdirs( File directory ) { - if ( directory == null ) - { - return false; - } - - if ( directory.exists() ) - { - return false; - } - if ( directory.mkdir() ) - { - return true; - } - - File canonDir = null; - try - { - canonDir = directory.getCanonicalFile(); - } - catch ( IOException e ) - { - return false; - } - - File parentDir = canonDir.getParentFile(); - return ( parentDir != null && ( mkdirs( parentDir ) || parentDir.exists() ) && canonDir.mkdir() ); + return directory.mkdirs(); } @Override
