Last HTTPClient dependency fixed

Author: Martin Vigliarolo

gxmail/src/main/java/com/genexus/internet/POP3Session.java

@@ -138,24 +138,6 @@ private void connectNormal() throws GXMailException
 		login();
     }
 
-//    private Socket getConnectionSocket(int type) throws UnknownHostException, IOException
-//    {
-//			System.setProperty("HTTPClient.sslUseTLS", "false");
-//			InetAddress ipAddr = InetAddress.getByName(pop3Host.trim());
-//			switch(type)
-//			{
-//			  case CONN_NORMAL:
-//			    return new Socket(pop3Host.trim(), pop3Port);
-//			  case CONN_TLS:
-//			    System.setProperty("HTTPClient.sslUseTLS", "true");
-//			    return HTTPClient.SSLManager.getSSLConnection(false).getSSLSocket(ipAddr, pop3Port);
-//			  case CONN_SSL:
-//			    HTTPClient.ISSLConnection connection = HTTPClient.SSLManager.getSSLConnection(false);
-//			    return connection.processSSLSocket(connection.getSSLSocket(ipAddr, pop3Port), ipAddr.getHostName(), pop3Port);
-//			}
-//			return new Socket(pop3Host.trim(), pop3Port);
-//    }
-
 	private Socket getConnectionSocket(int type) throws UnknownHostException, IOException
 	{
 		InetAddress ipAddr = InetAddress.getByName(pop3Host.trim());

gxmail/src/main/java/com/genexus/internet/SMTPSession.java

@@ -454,24 +454,6 @@ public void run()
             }
     }
 
-//    private Socket getConnectionSocket(int type) throws UnknownHostException, IOException
-//    {
-//			System.setProperty("HTTPClient.sslUseTLS", "false");
-//			InetAddress ipAddr = InetAddress.getByName(host.trim());
-//			switch(type)
-//			{
-//			  case CONN_NORMAL:
-//			    return new Socket(host.trim(), port);
-//			  case CONN_TLS:
-//			    System.setProperty("HTTPClient.sslUseTLS", "true");
-//			    return HTTPClient.SSLManager.getSSLConnection(false).getSSLSocket(ipAddr, port);
-//			  case CONN_SSL:
-//			    HTTPClient.ISSLConnection connection = HTTPClient.SSLManager.getSSLConnection(false);
-//			    return connection.processSSLSocket(connection.getSSLSocket(ipAddr, port), ipAddr.getHostName(), port);
-//			}
-//			return new Socket(host.trim(), port);
-//    }
-
 	private Socket getConnectionSocket(int type) throws UnknownHostException, IOException
 	{
 		InetAddress ipAddr = InetAddress.getByName(host.trim());

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

@@ -5,9 +5,6 @@
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import com.genexus.servlet.http.ICookie;
 import com.genexus.util.IniFile;
@@ -32,8 +29,6 @@
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.impl.auth.NTLMSchemeFactory;
@@ -193,27 +188,6 @@ private String getURLValid(String url) {
 		}
 	}
 
-//	private static SSLConnectionSocketFactory getSSLSecureInstance() {
-//		try {
-//			SSLContext sslContext = SSLContextBuilder
-//				.create()
-//				.loadTrustMaterial(new TrustSelfSignedStrategy())
-//				.build();
-//			return new SSLConnectionSocketFactory(
-//				sslContext,
-//				new String[] { "TLSv1", "TLSv1.1", "TLSv1.2" },
-//				null,
-//				SSLConnectionSocketFactory.getDefaultHostnameVerifier());
-//		} catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException e) {
-//			e.printStackTrace();
-//		}
-//		return new SSLConnectionSocketFactory(
-//			SSLContexts.createDefault(),
-//			new String[] { "TLSv1", "TLSv1.1", "TLSv1.2"},
-//			null,
-//			SSLConnectionSocketFactory.getDefaultHostnameVerifier());
-//	}
-
 	private CookieStore setAllStoredCookies() {
 		ICookie[] webcookies;
 

java/src/main/java/com/genexus/webpanels/GXWebObjectBase.java

@@ -256,7 +256,6 @@ private void cleanModelContext()
 		{
 			((ThreadLocal)com.genexus.CommonUtil.threadCalendar).getClass().getMethod("remove", new Class[0]).invoke(com.genexus.CommonUtil.threadCalendar, (java.lang.Object[])new Class[0]);
 			((ThreadLocal)com.genexus.ModelContext.threadModelContext).getClass().getMethod("remove", new Class[0]).invoke(com.genexus.ModelContext.threadModelContext, (java.lang.Object[])new Class[0]);
-			HTTPClient.StreamDemultiplexor.cleanup();
 		}
 		catch (NoSuchMethodException e)
 		{