diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java')
| -rw-r--r-- | platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java index 94e287e0fdb7..97082c394aaf 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java @@ -74,6 +74,8 @@ public class UpdatesXmlLoader { int followCount = 2; while(true) { cnx = requestUrl.openConnection(); + cnx.setConnectTimeout(HttpConfigurable.CONNECTION_TIMEOUT); + cnx.setReadTimeout(HttpConfigurable.CONNECTION_TIMEOUT); if (cnx instanceof HttpURLConnection) { HttpURLConnection hcnx = (HttpURLConnection)cnx; |