Changed charset representation

Author: phax

ph-as4-lib/src/main/java/com/helger/as4/messaging/mime/MimeMessageCreator.java

@@ -96,7 +96,7 @@ public static MimeMessage generateMimeMessage (@Nonnull final ESOAPVersion eSOAP
     ValueEnforcer.notNull (aSOAPEnvelope, "SOAPEnvelope");
 
     final Charset aCharset = AS4XMLHelper.XWS.getCharset ();
-    final SoapMimeMultipart aMimeMultipart = new SoapMimeMultipart (eSOAPVersion);
+    final SoapMimeMultipart aMimeMultipart = new SoapMimeMultipart (eSOAPVersion, aCharset);
     final EContentTransferEncoding eCTE = EContentTransferEncoding.BINARY;
     final String sContentType = eSOAPVersion.getMimeType (aCharset).getAsString ();
 

ph-as4-lib/src/main/java/com/helger/as4/messaging/mime/SoapMimeMultipart.java

@@ -16,6 +16,8 @@
  */
 package com.helger.as4.messaging.mime;
 
+import java.nio.charset.Charset;
+
 import javax.annotation.Nonnull;
 import javax.mail.internet.ContentType;
 import javax.mail.internet.MimeMultipart;
@@ -31,15 +33,16 @@
  */
 public class SoapMimeMultipart extends MimeMultipart
 {
-  public SoapMimeMultipart (@Nonnull final ESOAPVersion eSOAPVersion) throws ParseException
+  public SoapMimeMultipart (@Nonnull final ESOAPVersion eSOAPVersion,
+                            @Nonnull final Charset aCharset) throws ParseException
   {
     super ("related");
 
     // type parameter is essential for Axis to work!
-    // But only without the charset! Otherwise Holodeck complains that the
-    // receiver is unknown. Somewhat a bug in Axis according to Sander
-    final ContentType cType = new ContentType (contentType);
-    cType.setParameter ("type", eSOAPVersion.getMimeType ().getAsString ());
-    contentType = cType.toString ();
+    // But no charset! RFC 2387, section 3.4 has a special definition
+    final ContentType aContentType = new ContentType (contentType);
+    aContentType.setParameter ("type", eSOAPVersion.getMimeType ().getAsString ());
+    aContentType.setParameter ("charset", aCharset.name ());
+    contentType = aContentType.toString ();
   }
 }