aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-11-08 00:55:15 +0000
committerOlivier Lamy <olamy@apache.org>2013-11-08 00:55:15 +0000
commita8fc937678db2d72616b7f0fd415b1ca4e30863c (patch)
treea52167f45ed9f1f4e2b88c979433c02b6f2c0fe6 /archiva-modules
parent8bb7a7f857bb773fac8cb92f7acd8240e7310b97 (diff)
downloadarchiva-a8fc937678db2d72616b7f0fd415b1ca4e30863c.tar.gz
archiva-a8fc937678db2d72616b7f0fd415b1ca4e30863c.zip
fix timeout
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1539888 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
index 37563cd83..665860d9c 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
@@ -484,7 +484,8 @@ public class DownloadRemoteIndexTask
}, consumer, null );
try
{
- file = httpResponseFuture.get( this.remoteRepository.getTimeout(), TimeUnit.SECONDS );
+ int timeOut = this.remoteRepository.getRemoteDownloadTimeout();
+ file = timeOut > 0 ? httpResponseFuture.get( timeOut, TimeUnit.SECONDS ) : httpResponseFuture.get();
}
catch ( InterruptedException e )
{