Merge pull request #483 from jagathsisira/ESBJAVA-4274

ESBJAVA-4333 fix
wso2 · Nov 29, 2015 · 08978e5 · 08978e5
2 parents b825945 + e219db8
commit 08978e5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...main/java/org/wso2/carbon/mediation/initializer/handler/CarbonTenantInfoConfigurator.java b/...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());