From 2a3cde7492cdbfc0f5f71567806c0aba95f36146 Mon Sep 17 00:00:00 2001 From: Shakila Sasikaran Date: Tue, 4 Aug 2020 10:00:05 +0530 Subject: [PATCH] Fix for https://github.com/wso2/product-ei/issues/5217 --- .../core/multitenancy/transports/TenantTransportSender.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/multitenancy/transports/TenantTransportSender.java b/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/multitenancy/transports/TenantTransportSender.java index 33d9020126b..54d593aca09 100644 --- a/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/multitenancy/transports/TenantTransportSender.java +++ b/core/org.wso2.carbon.core/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) {