From f902d321bd2ed272dc9dfb2d2b1bccb2dffd9af3 Mon Sep 17 00:00:00 2001 From: tonikelope Date: Sat, 6 Jan 2018 14:39:01 +0100 Subject: [PATCH] 2.78b --- src/megabasterd/ChunkUploader.java | 3 ++- src/megabasterd/ChunkUploaderMono.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/megabasterd/ChunkUploader.java b/src/megabasterd/ChunkUploader.java index 331cecffd..384a96000 100644 --- a/src/megabasterd/ChunkUploader.java +++ b/src/megabasterd/ChunkUploader.java @@ -37,6 +37,7 @@ import org.apache.http.impl.client.CloseableHttpClient; */ public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable { + public static final int FUTURE_TIMEOUT = 120; private final int _id; private final Upload _upload; private volatile boolean _exit; @@ -192,7 +193,7 @@ public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable { if (!_exit) { - httpresponse = futureTask.get(HTTP_TIMEOUT + 5, TimeUnit.SECONDS); + httpresponse = futureTask.get(FUTURE_TIMEOUT, TimeUnit.SECONDS); } else { diff --git a/src/megabasterd/ChunkUploaderMono.java b/src/megabasterd/ChunkUploaderMono.java index 3312f9b65..a678a2f6d 100644 --- a/src/megabasterd/ChunkUploaderMono.java +++ b/src/megabasterd/ChunkUploaderMono.java @@ -212,7 +212,7 @@ public class ChunkUploaderMono extends ChunkUploader { try { - httpresponse = futureTask.get(HTTP_TIMEOUT + 5, TimeUnit.SECONDS); + httpresponse = futureTask.get(FUTURE_TIMEOUT, TimeUnit.SECONDS); http_status = httpresponse.getStatusLine().getStatusCode();