aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java9
1 files changed, 2 insertions, 7 deletions
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 8bd5d4d5d..864d80690 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 );
}