MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] Check if proxy host is empty, but the checkbox "use proxy" is selected.

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-11-08 20:19:57 +04:00
parent 6847065c4f
commit 55f2969fc8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/jgit/GitHttpProxySupport.java
+3 -1
View File
@@ -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 {
plugins/github/src/org/jetbrains/plugins/github/GithubApiUtil.java
+2 -1
View File
@@ -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,