Index: org.wso2.carbon.cassandra.mgt/4.2.0/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraKeyspaceAdmin.java
===================================================================
--- org.wso2.carbon.cassandra.mgt/4.2.0/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraKeyspaceAdmin.java	(revision 186555)
+++ org.wso2.carbon.cassandra.mgt/4.2.0/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraKeyspaceAdmin.java	(working copy)
@@ -656,8 +656,8 @@
                 //Distributed cache is visible to all Cassandra cluster
                 //TODO: add cache related configuration to a common cassandra config file
                 //String sharedKey = getSharedKey();
-                String tenantDomain = PrivilegedCarbonContext.getCurrentContext().getTenantDomain();
-                String tenantUserName = PrivilegedCarbonContext.getCurrentContext().getUsername();
+                String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
+                String tenantUserName = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
                 if (!tenantDomain.equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
                     tenantUserName = tenantUserName + "@" + tenantDomain;
                 }
Index: org.wso2.carbon.cassandra.mgt/4.2.0/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraClusterAdmin.java
===================================================================
--- org.wso2.carbon.cassandra.mgt/4.2.0/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraClusterAdmin.java	(revision 186555)
+++ org.wso2.carbon.cassandra.mgt/4.2.0/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraClusterAdmin.java	(working copy)
@@ -121,7 +121,7 @@
         validateCF(cf);
 
         String keyspaceWithDomainName = keyspace;
-        String domainName = CarbonContext.getCurrentContext().getTenantDomain();
+        String domainName = CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         if (domainName != null && !"".equals(domainName) && !domainName.equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
             domainName = domainName.replace(".", "_");
             keyspaceWithDomainName = domainName + "_" + keyspace;
Index: org.wso2.carbon.cassandra.mgt/4.2.0/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraAdminComponentManager.java
===================================================================
--- org.wso2.carbon.cassandra.mgt/4.2.0/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraAdminComponentManager.java	(revision 186555)
+++ org.wso2.carbon.cassandra.mgt/4.2.0/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraAdminComponentManager.java	(working copy)
@@ -98,7 +98,7 @@
     public UserRealm getRealmForCurrentTenant() throws CassandraServerManagementException {
         assertInitialized();
         try {
-            return realmService.getTenantUserRealm(CarbonContext.getCurrentContext().getTenantId());
+            return realmService.getTenantUserRealm(CarbonContext.getThreadLocalCarbonContext().getTenantId());
         } catch (UserStoreException e) {
             throw new CassandraServerManagementException("Error accessing the UserRealm for super tenant : " + e, log);
         }
Index: org.wso2.carbon.cassandra.dataaccess/4.2.0/src/main/java/org/wso2/carbon/cassandra/dataaccess/MultitenantClusterRepository.java
===================================================================
--- org.wso2.carbon.cassandra.dataaccess/4.2.0/src/main/java/org/wso2/carbon/cassandra/dataaccess/MultitenantClusterRepository.java	(revision 186555)
+++ org.wso2.carbon.cassandra.dataaccess/4.2.0/src/main/java/org/wso2/carbon/cassandra/dataaccess/MultitenantClusterRepository.java	(working copy)
@@ -119,7 +119,7 @@
      */
     private BasicClusterRepository getClusterRepository(String owner) {
         String tenantDomain = MultitenantUtils.getTenantDomain(owner);
-//        int tenantID = CarbonContext.getCurrentContext().getTenantId();
+//        int tenantID = CarbonContext.getThreadLocalCarbonContext().getTenantId();
         return clusters.get(tenantDomain);
     }
 
@@ -132,7 +132,7 @@
     private BasicClusterRepository removeClusterRepository(String owner) {
         String tenantDomain = MultitenantUtils.getTenantDomain(owner);
 
-//        int tenantID = CarbonContext.getCurrentContext().getTenantId();
+//        int tenantID = CarbonContext.getThreadLocalCarbonContext().getTenantId();
         return clusters.remove(tenantDomain);
     }
 }
Index: org.wso2.carbon.cassandra.dataaccess/4.2.0/src/main/java/org/wso2/carbon/cassandra/dataaccess/BasicClusterRepository.java
===================================================================
--- org.wso2.carbon.cassandra.dataaccess/4.2.0/src/main/java/org/wso2/carbon/cassandra/dataaccess/BasicClusterRepository.java	(revision 186555)
+++ org.wso2.carbon.cassandra.dataaccess/4.2.0/src/main/java/org/wso2/carbon/cassandra/dataaccess/BasicClusterRepository.java	(working copy)
@@ -93,7 +93,7 @@
      * Remove all the clusters created by the current user
      */
     public void removeMyClusters(String owner) {
-        removeClusters(CarbonContext.getCurrentContext().getUsername());
+        removeClusters(CarbonContext.getThreadLocalCarbonContext().getUsername());
     }
 
     /**
Index: org.wso2.carbon.cassandra.dataaccess/4.2.0/src/main/java/org/wso2/carbon/cassandra/dataaccess/DataAccessServiceImpl.java
===================================================================
--- org.wso2.carbon.cassandra.dataaccess/4.2.0/src/main/java/org/wso2/carbon/cassandra/dataaccess/DataAccessServiceImpl.java	(revision 186555)
+++ org.wso2.carbon.cassandra.dataaccess/4.2.0/src/main/java/org/wso2/carbon/cassandra/dataaccess/DataAccessServiceImpl.java	(working copy)
@@ -142,7 +142,7 @@
      * @return Not null <code> Cluster</code> instance
      */
     public Cluster getClusterForCurrentUser(String sharedKey) {
-        CarbonContext carbonContext = CarbonContext.getCurrentContext();
+        CarbonContext carbonContext = CarbonContext.getThreadLocalCarbonContext();
         String userName = carbonContext.getUsername();
 
         String tenantDomain = carbonContext.getTenantDomain();
@@ -163,7 +163,7 @@
     }
 
     public Cluster getClusterForCurrentUser(String sharedKey, boolean resetConnection) {
-        CarbonContext carbonContext = CarbonContext.getCurrentContext();
+        CarbonContext carbonContext = CarbonContext.getThreadLocalCarbonContext();
         String userName = carbonContext.getUsername();
 
         String tenantDomain = carbonContext.getTenantDomain();
@@ -187,7 +187,7 @@
      * @param name the name of the <code>Cluster</code> instance to be destroyed
      */
     public void destroyCluster(String name) {
-        String userName = CarbonContext.getCurrentContext().getUsername();
+        String userName = CarbonContext.getThreadLocalCarbonContext().getUsername();
         clusterRepository.removeCluster(userName, name);
     }
 
@@ -195,7 +195,7 @@
      * @see DataAccessService#destroyClustersOfCurrentTenant()
      */
     public void destroyClustersOfCurrentTenant() {
-        clusterRepository.removeMyClusters(CarbonContext.getCurrentContext().getUsername());
+        clusterRepository.removeMyClusters(CarbonContext.getThreadLocalCarbonContext().getUsername());
     }
 
     /**