From fd8a2e6ee80e7c43d0dc111272c45f2b27e0244c Mon Sep 17 00:00:00 2001 From: jmehrens Date: Thu, 16 Nov 2023 16:32:51 -0600 Subject: [PATCH] java.io.UnsupportedEncodingException: en_US.iso885915 if charset is "en_US.iso885915" (#115) * java.io.UnsupportedEncodingException: en_US.iso885915 if charset is "en_US.iso885915" Signed-off-by: jmehrens --- core/src/main/resources/META-INF/javamail.charset.map | 1 + doc/src/main/resources/docs/CHANGES.txt | 1 + .../java/org/eclipse/angus/mail/util/MimeUtilityTest.java | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/core/src/main/resources/META-INF/javamail.charset.map b/core/src/main/resources/META-INF/javamail.charset.map index cc58d4f9..e933270a 100644 --- a/core/src/main/resources/META-INF/javamail.charset.map +++ b/core/src/main/resources/META-INF/javamail.charset.map @@ -54,6 +54,7 @@ iso-2022-cn ISO2022CN iso-2022-kr ISO2022KR utf-8 UTF8 utf8 UTF8 +en_US.iso885915 ISO-8859-15 ja_jp.iso2022-7 ISO2022JP ja_jp.eucjp EUCJIS diff --git a/doc/src/main/resources/docs/CHANGES.txt b/doc/src/main/resources/docs/CHANGES.txt index 9a565870..7bf66235 100644 --- a/doc/src/main/resources/docs/CHANGES.txt +++ b/doc/src/main/resources/docs/CHANGES.txt @@ -11,6 +11,7 @@ for the Eclipse EE4J Angus Mail project: ---------------------------- The following bugs have been fixed in the 2.0.3 release. +107: java.io.UnsupportedEncodingException: en_US.iso885915 if charset is "en_US.iso885915" 110: WildFly support for MailHandler CHANGES IN THE 2.0.2 RELEASE diff --git a/providers/angus-mail/src/test/java/org/eclipse/angus/mail/util/MimeUtilityTest.java b/providers/angus-mail/src/test/java/org/eclipse/angus/mail/util/MimeUtilityTest.java index c2b60d29..f5ddcfc7 100644 --- a/providers/angus-mail/src/test/java/org/eclipse/angus/mail/util/MimeUtilityTest.java +++ b/providers/angus-mail/src/test/java/org/eclipse/angus/mail/util/MimeUtilityTest.java @@ -180,4 +180,9 @@ public void testBadChineseCharsets() throws Exception { assertEquals("ms936", goodDecoded, MimeUtility.decodeWord(badms936)); assertEquals("cp936", goodDecoded, MimeUtility.decodeWord(badcp936)); } + + @Test + public void testLocaleISO885915() throws Exception { + assertEquals("ISO-8859-15", MimeUtility.javaCharset("en_US.iso885915")); + } }