Cherry pick branch 'genexuslabs:one-ip-timeout' into beta

Author: tomas-sexenian

java/src/main/java/com/genexus/internet/HttpClientJavaLib.java

@@ -18,6 +18,7 @@
 import org.apache.http.*;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.conn.DnsResolver;
 import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.entity.ContentType;
@@ -65,23 +66,44 @@
 
 public class HttpClientJavaLib extends GXHttpClient {
 
-	public HttpClientJavaLib() {
-		getPoolInstance();
-		ConnectionKeepAliveStrategy myStrategy = generateKeepAliveStrategy();
-		httpClientBuilder = HttpClients.custom().setConnectionManager(connManager).setConnectionManagerShared(true).setKeepAliveStrategy(myStrategy);
-		String gxDns = System.getProperty("GX_USE_FIRST_IP_DNS");
+	private static class FirstIpDnsResolver implements DnsResolver {
+		private final DnsResolver defaultDnsResolver = new SystemDefaultDnsResolver();
+
+		@Override
+		public InetAddress[] resolve(final String host) throws UnknownHostException {
+			InetAddress[] allIps = defaultDnsResolver.resolve(host);
+			if (allIps != null && allIps.length > 0) {
+				return new InetAddress[]{allIps[0]};
+			}
+			return allIps;
+		}
+	}
+
+	private static String getGxIpResolverConfig() {
+		String name = "GX_USE_FIRST_IP_DNS";
+		String gxDns = System.getProperty(name);
 		if (gxDns == null || gxDns.trim().isEmpty()) {
-			gxDns = System.getenv("GX_USE_FIRST_IP_DNS");
+			gxDns = System.getenv(name);
 		}
 		if (gxDns != null && gxDns.trim().equalsIgnoreCase("true")) {
-			httpClientBuilder.setDnsResolver(new SystemDefaultDnsResolver() {
-				@Override
-				public InetAddress[] resolve(String host) throws UnknownHostException {
-					InetAddress[] all = super.resolve(host);
-					return new InetAddress[] { all[0] };
-				}
-			});
+			return gxDns.trim();
+		} else {
+			return null;
 		}
+	}
+
+
+	public HttpClientJavaLib() {
+		getPoolInstance();
+		ConnectionKeepAliveStrategy myStrategy = generateKeepAliveStrategy();
+		HttpClientBuilder builder = HttpClients.custom()
+			.setConnectionManager(connManager)
+			.setConnectionManagerShared(true)
+			.setKeepAliveStrategy(myStrategy);
+		if (getGxIpResolverConfig() != null) {
+			builder.setDnsResolver(new FirstIpDnsResolver());
+		}
+		httpClientBuilder = builder;
 		cookies = new BasicCookieStore();		
 		streamsToClose = new Vector<>();
 	}
@@ -92,7 +114,13 @@ private static void getPoolInstance() {
 				RegistryBuilder.<ConnectionSocketFactory>create()
 					.register("http", PlainConnectionSocketFactory.INSTANCE).register("https",getSSLSecureInstance())
 					.build();
-			connManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+			String useFirstIpDnsResolver = getGxIpResolverConfig();
+			if (useFirstIpDnsResolver != null) {
+				DnsResolver dnsResolver = new FirstIpDnsResolver();
+				connManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry, dnsResolver);
+			} else {
+				connManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+			}
 			connManager.setMaxTotal((int) CommonUtil.val(clientCfg.getProperty("Client", "HTTPCLIENT_MAX_SIZE", "1000")));
 			connManager.setDefaultMaxPerRoute((int) CommonUtil.val(clientCfg.getProperty("Client", "HTTPCLIENT_MAX_PER_ROUTE", "1000")));