Merge branch 'master' into RemoteAddrFix

Author: tomas-sexenian

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

@@ -611,46 +611,44 @@ private String getNextMessage(String sTime, String sPrefix, boolean end)
 		return "--" + getStartMessage(sTime, sPrefix) + (end?"--":"");
 	}
 
-	private void sendAttachment(String sTime, String fileNamePath, String attachmentPath) throws GXMailException, IOException
-	{
+	private void sendAttachment(String sTime, String fileNamePath, String attachmentPath) throws GXMailException, IOException {
 		InputStream is = null;
 		String fileName = fileNamePath;
 		FileInputStream fis = null;
 
-		if	(fileNamePath.lastIndexOf(File.separator) != -1)
+		if (fileNamePath.lastIndexOf(File.separator) != -1)
 			fileName = fileNamePath.substring(fileNamePath.lastIndexOf(File.separator) + 1);
 
-   		try {
-			   fis = new FileInputStream(attachmentPath + fileNamePath);
-			   is = fis;
-		}
-		catch (FileNotFoundException e) {
-			log ("11 - FileNotFound " + e.getMessage());
+		try {
+			fis = new FileInputStream(attachmentPath + fileNamePath);
+			is = fis;
+
+			println(getNextMessageIdMixed(sTime, false));
+			println("Content-Type: " + "application/octet-stream");
+			println("Content-Transfer-Encoding: " + "base64");
+			println("Content-Disposition: " + "attachment; filename=\"" + GXMailer.getEncodedString(fileName) + "\"");
+			println("");
+
+			int BUFFER_SIZE = 4096;
+			byte[] buffer = new byte[BUFFER_SIZE];
+			OutputStream base64Output = new Base64OutputStream(outStream);
+			int n = is.read(buffer, 0, BUFFER_SIZE);
+			while (n >= 0) {
+				base64Output.write(buffer, 0, n);
+				n = is.read(buffer, 0, BUFFER_SIZE);
+			}
+			base64Output.flush();
+			outStream.writeBytes(CRLF);
+			outStream.flush();
+		} catch (FileNotFoundException e) {
+			log("11 - FileNotFound " + e.getMessage());
 			throw new GXMailException("Can't find " + attachmentPath + fileNamePath, MAIL_InvalidAttachment);
 		} finally {
-			   if (is != null)
-				   is.close();
-			   if (fis != null)
-				   fis.close();
+			if (is != null)
+				is.close();
+			if (fis != null)
+				fis.close();
 		}
-
-		println(getNextMessageIdMixed(sTime, false));
-		println("Content-Type: " + "application/octet-stream");
-		println("Content-Transfer-Encoding: " + "base64");
-		println("Content-Disposition: " + "attachment; filename=\"" + GXMailer.getEncodedString(fileName) + "\"");
-        println("");
-
-	  	int BUFFER_SIZE = 4096;
-		byte[] buffer = new byte[BUFFER_SIZE];
-		OutputStream base64Output = new Base64OutputStream(outStream);
-		int n = is.read(buffer, 0, BUFFER_SIZE);
-		while (n >= 0) {
-			base64Output.write(buffer, 0, n);
-			n = is.read(buffer, 0, BUFFER_SIZE);
-		}
-		base64Output.flush();
-		outStream.writeBytes(CRLF);
-		outStream.flush();
 	}
 
 	private void println(String s) throws IOException

java/src/main/java/com/genexus/db/driver/GXConnection.java

@@ -82,7 +82,7 @@ public final class GXConnection extends AbstractGXConnection implements Connecti
 
 	//JMX Properties
 	int numberRequest = 0;
-	java.util.Date timeLastRequest;
+	java.util.Date timeLastRequest = new java.util.Date();
 	String sentenceLastRequest;
 	String lastObjectExecuted;
 	boolean finishExecute = true;

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

@@ -4,6 +4,7 @@
 import java.net.InetAddress;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
@@ -21,6 +22,7 @@
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.entity.ContentType;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.auth.AuthSchemeProvider;
@@ -723,7 +725,11 @@ public String getString() {
 			return "";
 		try {
 			this.setEntity();
-			String res = EntityUtils.toString(entity, "UTF-8");
+			Charset charset = ContentType.getOrDefault(entity).getCharset();
+			if (charset == null) {
+				charset = StandardCharsets.UTF_8;
+			}
+			String res = EntityUtils.toString(entity, charset);
 			eof = true;
 			return res;
 		} catch (IOException e) {