diff --git a/common/src/main/java/HTTPClient/HTTPConnection.java b/common/src/main/java/HTTPClient/HTTPConnection.java
index 0e22ee77b..91eadf629 100644
--- a/common/src/main/java/HTTPClient/HTTPConnection.java
+++ b/common/src/main/java/HTTPClient/HTTPConnection.java
@@ -3192,11 +3192,11 @@ Response sendRequest(Request req, int con_timeout)
 
 	while (try_count-- > 0)
 	{
+		Socket sock = null;
 	    try
 	    {
 		// get a client socket
 
-		Socket sock;
 		if (input_demux == null  ||
 		    (sock = input_demux.getSocket()) == null)
 		{
@@ -3323,6 +3323,10 @@ Response sendRequest(Request req, int con_timeout)
 		Log.write(Log.CONN, "Conn:  Retrying request");
 		continue;
 	    }
+		finally
+		{
+			if (sock != null) sock.close();
+		}
 
 	    break;
 	}
@@ -3402,39 +3406,40 @@ Response sendRequest(Request req, int con_timeout)
      */
     private Socket getSocket(int con_timeout)  throws IOException
     {
-	Socket sock = null;
+		Socket sock = null;
+		try {
 
-	String actual_host;
-	int    actual_port;
+			String actual_host;
+			int    actual_port;
 
-	if (Proxy_Host != null)
-	{
-	    actual_host = Proxy_Host;
-	    actual_port = Proxy_Port;
-	}
-	else
-	{
-	    actual_host = Host;
-	    actual_port = Port;
-	}
+			if (Proxy_Host != null)
+			{
+				actual_host = Proxy_Host;
+				actual_port = Proxy_Port;
+			}
+			else
+			{
+				actual_host = Host;
+				actual_port = Port;
+			}
 
-	Log.write(Log.CONN, "Conn:  Creating Socket: " + actual_host + ":" +
-			    actual_port);
+			Log.write(Log.CONN, "Conn:  Creating Socket: " + actual_host + ":" +
+				actual_port);
 
-	if (con_timeout == 0)		// normal connection establishment
-	{
-	    if (Socks_client != null)
-		sock = Socks_client.getSocket(actual_host, actual_port);
-	    else
-	    {
-		// try all A records
-		InetAddress[] addr_list = InetAddress.getAllByName(actual_host);
-		for (int idx=0; idx<addr_list.length; idx++)
-		{
-		    try
-		    {
-			if (Protocol == HTTPS)
+			if (con_timeout == 0)		// normal connection establishment
 			{
+				if (Socks_client != null)
+					sock = Socks_client.getSocket(actual_host, actual_port);
+				else
+				{
+					// try all A records
+					InetAddress[] addr_list = InetAddress.getAllByName(actual_host);
+					for (int idx=0; idx<addr_list.length; idx++)
+					{
+						try
+						{
+							if (Protocol == HTTPS)
+							{
 //@gusbro
 /*			    if (LocalAddr == null)
 				sock = new SSLSocket(addr_list[idx], actual_port,
@@ -3445,58 +3450,63 @@ private Socket getSocket(int con_timeout)  throws IOException
 						     ssl_ctxt);
 			    ((SSLSocket) sock).setAutoHandshake(false);
 */
-                            if(LocalAddr == null)
-                              sock = sslConnection.getSSLSocket(addr_list[idx], actual_port);
-                            else sock = sslConnection.getSSLSocket(addr_list[idx], actual_port, LocalAddr, LocalPort);
+								if(LocalAddr == null)
+									sock = sslConnection.getSSLSocket(addr_list[idx], actual_port);
+								else sock = sslConnection.getSSLSocket(addr_list[idx], actual_port, LocalAddr, LocalPort);
 
-							//@iroqueta
-							sock.setTcpNoDelay(tcpNoDelay);
+								//@iroqueta
+								sock.setTcpNoDelay(tcpNoDelay);
 //@gusbro\
+							}
+							else
+							{
+								if (LocalAddr == null)
+									sock = new Socket(addr_list[idx], actual_port);
+								else
+									sock = new Socket(addr_list[idx], actual_port,
+										LocalAddr, LocalPort);
+								//@iroqueta
+								sock.setTcpNoDelay(tcpNoDelay);
+							}
+							break;		// success
+						}
+						catch (SocketException se)
+						{
+							if (idx == addr_list.length-1)
+								throw se;	// we tried them all
+						}
+					}
+				}
 			}
 			else
 			{
-			    if (LocalAddr == null)
-				sock = new Socket(addr_list[idx], actual_port);
-			    else
-				sock = new Socket(addr_list[idx], actual_port,
-						  LocalAddr, LocalPort);
+				EstablishConnection con =
+					new EstablishConnection(actual_host, actual_port, Socks_client);
 				//@iroqueta
-				sock.setTcpNoDelay(tcpNoDelay);
-			}
-			break;		// success
-		    }
-		    catch (SocketException se)
-		    {
-			if (idx == addr_list.length-1)
-			    throw se;	// we tried them all
-		    }
-		}
-	    }
-	}
-	else
-	{
-	    EstablishConnection con =
-		new EstablishConnection(actual_host, actual_port, Socks_client);
-		//@iroqueta
-		con.setTcpNoDelay(tcpNoDelay);
+				con.setTcpNoDelay(tcpNoDelay);
 
-	    con.start();
-	    try
-		{ con.join((long) con_timeout); }
-	    catch (InterruptedException ie)
-		{ }
+				con.start();
+				try
+				{ con.join((long) con_timeout); }
+				catch (InterruptedException ie)
+				{ }
 
-	    if (con.getException() != null)
-		throw con.getException();
-	    if ((sock = con.getSocket()) == null)
-	    {
-		con.forget();
-		if ((sock = con.getSocket()) == null)
-		    throw new InterruptedIOException("Connection establishment timed out");
-	    }
-	}
+				if (con.getException() != null)
+					throw con.getException();
+				if ((sock = con.getSocket()) == null)
+				{
+					con.forget();
+					if ((sock = con.getSocket()) == null)
+						throw new InterruptedIOException("Connection establishment timed out");
+				}
+			}
 
-	return sock;
+			return sock;
+		}
+		finally
+		{
+			if (sock != null) sock.close();
+		}
     }
 
 
diff --git a/common/src/main/java/HTTPClient/SocksClient.java b/common/src/main/java/HTTPClient/SocksClient.java
index 021b7b81d..c08c00b3c 100644
--- a/common/src/main/java/HTTPClient/SocksClient.java
+++ b/common/src/main/java/HTTPClient/SocksClient.java
@@ -212,15 +212,9 @@ Socket getSocket(String host, int port, InetAddress localAddr,
 
 	    return sock;
 	}
-	catch (IOException ioe)
+	finally
 	{
-	    if (sock != null)
-	    {
-		try { sock.close(); }
-		catch (IOException ee) {}
-	    }
-
-	    throw ioe;
+		if (sock != null) sock.close();
 	}
     }
 
diff --git a/gxodata/src/main/java/com/genexus/db/odata/ODataConnection.java b/gxodata/src/main/java/com/genexus/db/odata/ODataConnection.java
index c03013681..353c66c11 100644
--- a/gxodata/src/main/java/com/genexus/db/odata/ODataConnection.java
+++ b/gxodata/src/main/java/com/genexus/db/odata/ODataConnection.java
@@ -501,7 +501,7 @@ public void clear()
 
 		private void loginBO()
 		{
-			try
+			try (DefaultHttpClient webClient = new DefaultHttpClient();)
 			{
 				doLogin = false;
 				B1_sessionIds.remove(loginBase);
@@ -509,7 +509,6 @@ private void loginBO()
 				HttpPost login = new HttpPost(loginURI);
 				StringEntity sloginInfo = new StringEntity(String.format("{\"UserName\":\"%s\", \"CompanyDB\":\"%s\"}", user, sapLoginBO));
 				login.setEntity(sloginInfo);
-				DefaultHttpClient webClient = new DefaultHttpClient();
 				HttpResponse loginResponse = webClient.execute(login);
 				Header cookieHdr = loginResponse.getFirstHeader("Set-Cookie");
 				if(cookieHdr != null)
diff --git a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
index f070004a6..87f7dedd1 100644
--- a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
+++ b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
@@ -654,10 +654,9 @@ public InputStream getInputStream() throws IOException {
 
 	public InputStream getInputStream(String stringURL) throws IOException
 	{
-		try {
+		try (CloseableHttpClient gISHttpClient = HttpClients.createDefault()) {
 			URI url = new URI(stringURL);
 			HttpGet gISHttpGet = new HttpGet(String.valueOf(url));
-			CloseableHttpClient gISHttpClient = HttpClients.createDefault();
 			return gISHttpClient.execute(gISHttpGet).getEntity().getContent();
 
 		} catch (URISyntaxException e) {