Merge pull request #2728 from Shakila/4.5.x

Add transport.mail.Format to message context
wso2 · Aug 4, 2020 · 6843f35 · 6843f35
2 parents c7f96f3 + 2a3cde7
commit 6843f35
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...ore/src/main/java/org/wso2/carbon/core/multitenancy/transports/TenantTransportSender.java b/...ore/src/main/java/org/wso2/carbon/core/multitenancy/transports/TenantTransportSender.java
@@ -62,6 +62,7 @@ public class TenantTransportSender extends AbstractHandler implements TransportS
     private static final String FORCE_SC_ACCEPTED = "FORCE_SC_ACCEPTED";
     private static final String FORCE_POST_PUT_NOBODY = "FORCE_POST_PUT_NOBODY";
     private static final String DELETE_REQUEST_WITH_PAYLOAD = "DELETE_REQUEST_WITH_PAYLOAD";
+    private static final String TRANSPORT_MAIL_FORMAT = "transport.mail.Format";
 
     private MultitenantMsgContextDataHolder dataHolder = MultitenantMsgContextDataHolder.getInstance();
 
@@ -256,6 +257,11 @@ public InvocationResponse invoke(MessageContext msgContext) throws AxisFault
             superTenantOutMessageContext.setProperty(NO_ENTITY_BODY, msgContext.getProperty(NO_ENTITY_BODY));
         }
 
+        if (msgContext.getProperty(TRANSPORT_MAIL_FORMAT) != null) {
+            superTenantOutMessageContext.setProperty(TRANSPORT_MAIL_FORMAT,
+                    msgContext.getProperty(TRANSPORT_MAIL_FORMAT));
+        }
+
         // set additional multitenant message context properties read from multitenant-msg-context.properties file
         for (String property : dataHolder.getTenantMsgContextProperties()) {
             if (msgContext.getProperty(property) != null) {