From 55f2969fc841e43a1be98bd59fb93ae225700977 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 8 Nov 2012 20:17:47 +0400
Subject: [PATCH] [git] Check if proxy host is empty, but the checkbox "use
 proxy" is selected.

---
 plugins/git4idea/src/git4idea/jgit/GitHttpProxySupport.java   | 4 +++-
 .../src/org/jetbrains/plugins/github/GithubApiUtil.java       | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/jgit/GitHttpProxySupport.java b/plugins/git4idea/src/git4idea/jgit/GitHttpProxySupport.java
index 2bc992461b71..848f23914cb3 100644
--- a/plugins/git4idea/src/git4idea/jgit/GitHttpProxySupport.java
+++ b/plugins/git4idea/src/git4idea/jgit/GitHttpProxySupport.java
@@ -15,6 +15,7 @@
  */
 package git4idea.jgit;
 
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.net.HttpConfigurable;
 import org.jetbrains.annotations.NotNull;
 
@@ -41,7 +42,8 @@ final class GitHttpProxySupport {
   }
 
   static boolean shouldUseProxy() {
-    return HttpConfigurable.getInstance().USE_HTTP_PROXY;
+    HttpConfigurable proxySettings = HttpConfigurable.getInstance();
+    return proxySettings.USE_HTTP_PROXY && !StringUtil.isEmptyOrSpaces(proxySettings.PROXY_HOST);
   }
   
   private static class IdeaProxySelector extends ProxySelector {
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubApiUtil.java b/plugins/github/src/org/jetbrains/plugins/github/GithubApiUtil.java
index ac8effa03d62..1549c145c048 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubApiUtil.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubApiUtil.java
@@ -19,6 +19,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.net.HttpConfigurable;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
@@ -155,7 +156,7 @@ public class GithubApiUtil {
     client.getParams().setContentCharset("UTF-8");
     // Configure proxySettings if it is required
     final HttpConfigurable proxySettings = HttpConfigurable.getInstance();
-    if (proxySettings.USE_HTTP_PROXY){
+    if (proxySettings.USE_HTTP_PROXY && !StringUtil.isEmptyOrSpaces(proxySettings.PROXY_HOST)){
       client.getHostConfiguration().setProxy(proxySettings.PROXY_HOST, proxySettings.PROXY_PORT);
       if (proxySettings.PROXY_AUTHENTICATION) {
         client.getState().setProxyCredentials(AuthScope.ANY, new UsernamePasswordCredentials(proxySettings.PROXY_LOGIN,