From 0b7e94ad5402e16ac5d10bdeb967d67d91c92db1 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Fri, 18 Sep 2020 10:58:38 -0400 Subject: [PATCH] use default timeout if none provided --- src/main/java/org/cobbzilla/util/http/HttpUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/cobbzilla/util/http/HttpUtil.java b/src/main/java/org/cobbzilla/util/http/HttpUtil.java index af2a323..7c46b49 100644 --- a/src/main/java/org/cobbzilla/util/http/HttpUtil.java +++ b/src/main/java/org/cobbzilla/util/http/HttpUtil.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.Map; import static com.google.common.net.HttpHeaders.CONTENT_DISPOSITION; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.apache.http.HttpHeaders.*; import static org.cobbzilla.util.daemon.ZillaRuntime.*; @@ -59,6 +60,7 @@ public class HttpUtil { public static final String CHUNKED_ENCODING = "chunked"; public static final String USER_AGENT_CURL = "curl/7.64.1"; + public static final Long DEFAULT_CONNECT_TIMEOUT = SECONDS.toMillis(15); public static Map queryParams(URL url) throws UnsupportedEncodingException { return queryParams(url, StringUtil.UTF8); @@ -89,7 +91,7 @@ public class HttpUtil { } public static InputStream get (String urlString, Map headers, Map headers2) throws IOException { - return get(urlString, headers, headers2, null); + return get(urlString, headers, headers2, DEFAULT_CONNECT_TIMEOUT); } public static InputStream get (String urlString, Map headers, Map headers2, Long connectTimeout) throws IOException {