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 2016/09/26 22:35:43 UTC
archiva git commit: simplify code
Repository: archiva
Updated Branches:
refs/heads/master 712275456 -> 85be2b77a
simplify code
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/85be2b77
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/85be2b77
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/85be2b77
Branch: refs/heads/master
Commit: 85be2b77aff90ec03e1eec2ab8ed562763c7caf5
Parents: 7122754
Author: olivier lamy <ol...@apache.org>
Authored: Tue Sep 27 08:35:10 2016 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Tue Sep 27 08:35:38 2016 +1000
----------------------------------------------------------------------
.../archiva/proxy/DefaultRepositoryProxyConnectors.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/85be2b77/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
index 8bd5d4d..864d806 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -1092,8 +1092,7 @@ public class DefaultRepositoryProxyConnectors
throws ProxyException
{
- // TODO file lock library
- Lock lock = null;
+ Lock lock;
try
{
lock = fileLockManager.writeFileLock( target );
@@ -1131,11 +1130,7 @@ public class DefaultRepositoryProxyConnectors
}
}
}
- catch ( FileLockException e )
- {
- throw new ProxyException( e.getMessage(), e );
- }
- catch ( FileLockTimeoutException e )
+ catch ( FileLockException | FileLockTimeoutException e )
{
throw new ProxyException( e.getMessage(), e );
}