diff --git a/platform/platform-api/src/com/intellij/util/net/IdeaWideAuthenticator.java b/platform/platform-api/src/com/intellij/util/net/IdeaWideAuthenticator.java index 303ed37dc3b6..fedcb359b03d 100644 --- a/platform/platform-api/src/com/intellij/util/net/IdeaWideAuthenticator.java +++ b/platform/platform-api/src/com/intellij/util/net/IdeaWideAuthenticator.java @@ -68,6 +68,7 @@ public class IdeaWideAuthenticator extends NonStaticAuthenticator { ApplicationManager.getApplication().isDisposed()) return null; LOG.debug("CommonAuthenticator.getPasswordAuthentication generic authentication will be asked"); - return myHttpConfigurable.getGenericPromptedAuthentication(prefix, host, getRequestingPrompt(), getRequestingPort(), false); + //return myHttpConfigurable.getGenericPromptedAuthentication(prefix, host, getRequestingPrompt(), getRequestingPort(), false); + return null; } } diff --git a/plugins/git4idea/src/git4idea/jgit/GitHttpAdapter.java b/plugins/git4idea/src/git4idea/jgit/GitHttpAdapter.java index 46893982c680..96f5fb9014ec 100644 --- a/plugins/git4idea/src/git4idea/jgit/GitHttpAdapter.java +++ b/plugins/git4idea/src/git4idea/jgit/GitHttpAdapter.java @@ -56,7 +56,10 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.regex.Pattern; /** @@ -309,13 +312,8 @@ public final class GitHttpAdapter { String url = command.getUrl(); GitHttpCredentialsProvider provider = command.getCredentialsProvider(); - final Set tried = new HashSet(); try { for (int i = 0; i < 3; i++) { - final CommonProxy.HostInfo hostInfo = getHostInfo(url); - CommonProxy.getInstance().noAuthentication(hostInfo.getProtocol(), hostInfo.getHost(), hostInfo.getPort()); - tried.add(hostInfo); - try { AuthData authData = getUsernameAndPassword(provider.getProject(), provider.getUrl()); if (authData != null) { @@ -384,9 +382,6 @@ public final class GitHttpAdapter { } finally { log(command, project); - for (CommonProxy.HostInfo info : tried) { - CommonProxy.getInstance().removeNoAuthentication(info.getProtocol(), info.getHost(), info.getPort()); - } } }