From c2d4abd4278603ffe9902a4ebe1b16fd5f0fae85 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Tue, 29 Jan 2013 21:09:31 +0400
Subject: [PATCH] IDEA-99921 When for HTTP Proxy authentication no 'save
 password' option is selected, Login dialog appears few times

---
 .../src/com/intellij/util/net/HttpConfigurable.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
index 5aa411a86276..7ee9dc7bd983 100644
--- a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
+++ b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
@@ -169,8 +169,9 @@ public class HttpConfigurable implements PersistentStateComponent<HttpConfigurab
   }
 
   public PasswordAuthentication getPromptedAuthentication(final String host, final String prompt) {
-    if (PROXY_AUTHENTICATION && KEEP_PROXY_PASSWORD) {
-      return new PasswordAuthentication(PROXY_LOGIN, getPlainProxyPassword().toCharArray());
+    final String password = getPlainProxyPassword();
+    if (! StringUtil.isEmptyOrSpaces(PROXY_LOGIN) && ! StringUtil.isEmptyOrSpaces(password)) {
+      return new PasswordAuthentication(PROXY_LOGIN, password.toCharArray());
     }
     final PasswordAuthentication[] value = new PasswordAuthentication[1];
     final Runnable runnable = new Runnable() {