From aa7680653779cab56602d5aa27460e167188dd02 Mon Sep 17 00:00:00 2001
From: iroqueta <iroqueta@genexus.com>
Date: Wed, 18 Aug 2021 18:12:50 -0300
Subject: [PATCH] Cherry pick branch 'genexuslabs:HttpClientLocation' into beta

---
 java/src/main/java/com/genexus/internet/HttpClientJavaLib.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
index 6dcd74eb5..7158a9e04 100644
--- a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
+++ b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
@@ -268,7 +268,7 @@ public void execute(String method, String url) {
 				this.httpClientBuilder.setDefaultCookieStore(cookiesToSend);    // Cookies Seteo CookieStore
 			}
 
-			if (getProxyInfoChanged()) {
+			if (getProxyInfoChanged() && !getProxyServerHost().isEmpty() && getProxyServerPort() != 0) {
 				HttpHost proxy = new HttpHost(getProxyServerHost(), getProxyServerPort());
 				this.httpClientBuilder.setRoutePlanner(new DefaultProxyRoutePlanner(proxy));
 				this.reqConfig = RequestConfig.custom()