From e219db88df697bf74288826937c5180e3de59755 Mon Sep 17 00:00:00 2001
From: jagatha <jagatha@wso2.com>
Date: Thu, 26 Nov 2015 15:31:21 +0530
Subject: [PATCH] ESBJAVA-4333 fix

---
 .../initializer/handler/CarbonTenantInfoConfigurator.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/mediation-initializer/org.wso2.carbon.mediation.initializer/src/main/java/org/wso2/carbon/mediation/initializer/handler/CarbonTenantInfoConfigurator.java b/components/mediation-initializer/org.wso2.carbon.mediation.initializer/src/main/java/org/wso2/carbon/mediation/initializer/handler/CarbonTenantInfoConfigurator.java
index 1cbbc91685c..affa75a076e 100644
--- a/components/mediation-initializer/org.wso2.carbon.mediation.initializer/src/main/java/org/wso2/carbon/mediation/initializer/handler/CarbonTenantInfoConfigurator.java
+++ b/components/mediation-initializer/org.wso2.carbon.mediation.initializer/src/main/java/org/wso2/carbon/mediation/initializer/handler/CarbonTenantInfoConfigurator.java
@@ -66,8 +66,12 @@ public boolean applyTenantInfo(MessageContext messageContext) {
         //Current context does not need to be destroyed at this level.
         //PrivilegedCarbonContext.destroyCurrentContext();
         PrivilegedCarbonContext cc = PrivilegedCarbonContext.getThreadLocalCarbonContext();
-        cc.setTenantDomain(tenantDomain);
-        cc.setTenantId(tenantId);
+        if (cc.getTenantDomain() == null) {
+            cc.setTenantDomain(tenantDomain);
+        }
+        if (cc.getTenantId() == MultitenantConstants.INVALID_TENANT_ID) {
+            cc.setTenantId(tenantId);
+        }
         if (logger.isDebugEnabled()) {
             logger.info("      tenant domain: " + cc.getTenantDomain());
             logger.info("      tenant id: " + cc.getTenantId());