Cherry pick branch 'genexuslabs:FunnyFix' into beta

Author: tomas-sexenian

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

@@ -703,9 +703,15 @@ public String getString() {
 			return "";
 		try {
 			this.setEntity();
-			Charset charset = ContentType.getOrDefault(entity).getCharset();
-			if (charset == null) {
+			ContentType contentType = ContentType.getOrDefault(entity);
+			Charset charset;
+			if (contentType.equals(ContentType.DEFAULT_TEXT)) {
 				charset = StandardCharsets.UTF_8;
+			} else {
+				charset = contentType.getCharset();
+				if (charset == null) {
+					charset = StandardCharsets.UTF_8;
+				}
 			}
 			String res = EntityUtils.toString(entity, charset);
 			eof = true;