Index: 4.2.0/src/main/java/org/wso2/carbon/datasource/multitenancy/DataSourceInitializer.java
===================================================================
--- 4.2.0/src/main/java/org/wso2/carbon/datasource/multitenancy/DataSourceInitializer.java	(revision 182334)
+++ 4.2.0/src/main/java/org/wso2/carbon/datasource/multitenancy/DataSourceInitializer.java	(working copy)
@@ -50,10 +50,10 @@
 
         try {
             String tenantDomain = CarbonContext.getCurrentContext().getTenantDomain();
-            PrivilegedCarbonContext.startTenantFlow();
-            PrivilegedCarbonContext.getCurrentContext().setTenantId(tenantId);
-            PrivilegedCarbonContext.getCurrentContext().setTenantDomain(tenantDomain);
-
+            PrivilegedCarbonContext.startTenantFlow();          
+			PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenantId, true);
+			PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain,
+			                                                                      true);;
         //creating a separate datasource repository for the tenant
         DataSourceInformationRepository repository = new DataSourceInformationRepository();
         DataSourceInformationRepositoryListener listener = new DataSourceRepositoryManager(