Remove fallback to system default charset solving #467

Signed-off-by: Olaf Neumann <eclipse@olafneumann.org>
jakartaee · Aug 16, 2021 · 3005fd7 · 3005fd7
1 parent 2a22ef4
commit 3005fd7
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/mail/src/main/java/jakarta/mail/internet/MimeUtility.java b/mail/src/main/java/jakarta/mail/internet/MimeUtility.java
@@ -1291,20 +1291,14 @@ public static String getDefaultJavaCharset() {
 	    try {
 		defaultJavaCharset = System.getProperty("file.encoding", 
 							"8859_1");
-	    } catch (SecurityException sex) {
-
-		class NullInputStream extends InputStream {
-		    @Override
-		    public int read() {
-			return 0;
-		    }
+		} catch (final SecurityException sex) {
+			// fall back to ISO-Latin-1
+			// don't use actual system encoding, because this might be
+			// something completely different, like EBCDIC (IBM-037)
+			if (defaultJavaCharset == null) {
+				defaultJavaCharset = "8859_1";
+			}
 		}
-		InputStreamReader reader = 
-			new InputStreamReader(new NullInputStream());
-		defaultJavaCharset = reader.getEncoding();
-		if (defaultJavaCharset == null)
-		    defaultJavaCharset = "8859_1";
-	    }
 	}
 
 	return defaultJavaCharset;