You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/04/16 20:17:37 UTC
archiva git commit: Fixing locking tests on windows
Repository: archiva
Updated Branches:
refs/heads/master 151fae7e1 -> b0f22a246
Fixing locking tests on windows
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/b0f22a24
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/b0f22a24
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/b0f22a24
Branch: refs/heads/master
Commit: b0f22a24699685fd8a77cbe7530b82e26c10bb0f
Parents: 151fae7
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Apr 16 22:17:16 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Apr 16 22:17:16 2017 +0200
----------------------------------------------------------------------
.../common/filelock/DefaultFileLockManagerTimeoutTest.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/b0f22a24/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
index cd2cba2..666efee 100644
--- a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
+++ b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
@@ -30,6 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.File;
+import java.io.IOException;
import java.nio.file.FileSystemException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
@@ -72,7 +73,13 @@ public class DefaultFileLockManagerTimeoutTest
Lock lock = fileLockManager.writeFileLock(file);
- Files.copy(largeJar.toPath(), lock.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
+ try {
+ Files.copy(largeJar.toPath(), lock.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
+ } catch (IOException e) {
+ logger.warn("Copy failed "+e.getMessage());
+ // On windows a FileSystemException is thrown
+ // We ignore this
+ }
lock = fileLockManager.writeFileLock(file);
} catch (FileSystemException ex) {