svn commit: r1893961 - in /geronimo/specs/trunk/geronimo-javamail_1.6_spec/src: main/java/javax/mail/internet/MimeBodyPart.java test/java/javax/mail/internet/MimeBodyPartTest.java
[email protected] Thu, 07 Oct 2021 08:54:34 -0000
| Newsgroups | gmane.comp.java.geronimo.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jlmonteiro
Date: Thu Oct 7 08:54:34 2021
New Revision: 1893961
URL: http://svn.apache.org/viewvc?rev=1893961&view=rev
Log:
GERONIMO-6800 MimeBodyPart.setText ignores subtype
Patch from Argannor
Modified:
geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/main/java/javax/mail/internet/MimeBodyPart.java
geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/test/java/javax/mail/internet/MimeBodyPartTest.java
Modified: geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/main/java/javax/mail/internet/MimeBodyPart.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/main/java/javax/mail/internet/MimeBodyPart.java?rev=1893961&r1=1893960&r2=1893961&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/main/java/javax/mail/internet/MimeBodyPart.java (original)
+++ geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/main/java/javax/mail/internet/MimeBodyPart.java Thu Oct 7 08:54:34 2021
@@ -466,7 +466,11 @@ public class MimeBodyPart extends BodyPa
charset = "us-ascii";
}
}
- setContent(text, "text/plain; charset=" + MimeUtility.quote(charset, HeaderTokenizer.MIME));
+ String actualSubtype = subtype;
+ if(actualSubtype == null || actualSubtype.isEmpty()) {
+ actualSubtype = "plain";
+ }
+ setContent(text, "text/" + actualSubtype + "; charset=" + MimeUtility.quote(charset, HeaderTokenizer.MIME));
}
public void setContent(final Multipart part) throws MessagingException {
Modified: geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/test/java/javax/mail/internet/MimeBodyPartTest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/test/java/javax/mail/internet/MimeBodyPartTest.java?rev=1893961&r1=1893960&r2=1893961&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/test/java/javax/mail/internet/MimeBodyPartTest.java (original)
+++ geronimo/specs/trunk/geronimo-javamail_1.6_spec/src/test/java/javax/mail/internet/MimeBodyPartTest.java Thu Oct 7 08:54:34 2021
@@ -20,6 +20,7 @@
package javax.mail.internet;
import junit.framework.TestCase;
+import org.apache.geronimo.mail.util.StringBufferOutputStream;
import javax.activation.DataHandler;
import javax.mail.EncodingAware;
@@ -227,6 +228,13 @@ public class MimeBodyPartTest extends Te
compareFileData(testData, tempData);
}
+ public void testSetTextSubtype() throws Exception {
+ final MimeBodyPart part = new MimeBodyPart();
+ part.setText("<html>", "utf-8", "html");
+
+ assertEquals( "text/html; charset=utf-8", part.dh.getContentType());
+ }
+
private byte[] getFileData(final File source) throws Exception {
final FileInputStream testIn = new FileInputStream(source);