From b8064547e4e60369f13d6ff60f2ff82c42feb8ca Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 12 Nov 2014 12:26:48 +0100 Subject: [PATCH] =?UTF-8?q?UpdateChecker=20=E2=80=94=20use=20platform=20ti?= =?UTF-8?q?meout=20defaults=20(5=20sec=20connection=20timeout=20could=20be?= =?UTF-8?q?=20not=20enough=20even=20in=20normal=20case)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/updateSettings/impl/UpdateChecker.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java index 08ed9832de5c..f3a8f5677371 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java @@ -41,7 +41,10 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.StandardFileSystems; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.*; +import com.intellij.util.Function; +import com.intellij.util.HttpRequests; +import com.intellij.util.PlatformUtils; +import com.intellij.util.ThrowableConvertor; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.io.UrlConnectionUtil; import com.intellij.util.net.HttpConfigurable; @@ -471,8 +474,6 @@ public final class UpdateChecker { } return HttpRequests.request(updateUrl.startsWith("file:") ? updateUrl : updateUrl + '?' + prepareUpdateCheckArgs()) - .connectTimeout(5 * Time.SECOND) - .readTimeout(5 * Time.SECOND) .get(new ThrowableConvertor() { @Override public UpdatesInfo convert(URLConnection connection) throws Exception {