From 747ba28f0f5dade5b60af60d681f7e5a483d16da Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 30 Jan 2013 16:32:33 +0400 Subject: [PATCH] Drop read lock from proxy --- .../src/com/intellij/util/net/CommonProxy.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/platform/platform-api/src/com/intellij/util/net/CommonProxy.java b/platform/platform-api/src/com/intellij/util/net/CommonProxy.java index 34a6479c2421..c3d7da3225a0 100644 --- a/platform/platform-api/src/com/intellij/util/net/CommonProxy.java +++ b/platform/platform-api/src/com/intellij/util/net/CommonProxy.java @@ -23,7 +23,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ui.MessageType; import com.intellij.openapi.ui.popup.util.PopupUtil; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; @@ -183,14 +182,8 @@ public class CommonProxy extends ProxySelector { final List selected = myIDEAWide.select(uri); final HttpConfigurable configurable; final Application application = ApplicationManager.getApplication(); - if (application != null && ! application.isDisposed()) { - configurable = application.runReadAction(new Computable() { - @Override - public HttpConfigurable compute() { - if (application.isDisposeInProgress() || application.isDisposed()) return null; - return HttpConfigurable.getInstance(); - } - }); + if (application != null && !application.isDisposed() && !application.isDisposeInProgress()) { + configurable = HttpConfigurable.getInstance(); if (configurable != null && configurable.USE_HTTP_PROXY) { configurable.LAST_ERROR = null; }