Index: src/main/java/org/wso2/carbon/utils/ThriftSession.java
===================================================================
--- src/main/java/org/wso2/carbon/utils/ThriftSession.java	(revision 144914)
+++ src/main/java/org/wso2/carbon/utils/ThriftSession.java	(working copy)
@@ -23,6 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 public class ThriftSession {
 
@@ -138,7 +139,7 @@
      */
     public CarbonContext getSessionCarbonContextHolder() {
         CarbonBaseUtils.checkSecurity(ALLOWED_METHODS);
-        return (CarbonContext) attributeMap.get(CARBON_CONTEXT_HOLDER);
+        return (PrivilegedCarbonContext) attributeMap.get(CARBON_CONTEXT_HOLDER);
     }
 
     /**
Index: src/main/java/org/wso2/carbon/context/PrivilegedCarbonContext.java
===================================================================
--- src/main/java/org/wso2/carbon/context/PrivilegedCarbonContext.java	(revision 144914)
+++ src/main/java/org/wso2/carbon/context/PrivilegedCarbonContext.java	(working copy)
@@ -181,7 +181,10 @@
      */
     public static PrivilegedCarbonContext getCurrentContext(ThriftSession thriftSession) {
         CarbonUtils.checkSecurity();
-        return new PrivilegedCarbonContext(CarbonContextDataHolder.getCurrentCarbonContextHolder(thriftSession));
+        PrivilegedCarbonContext privilegedCarbonContext =
+                new PrivilegedCarbonContext(CarbonContextDataHolder.getCurrentCarbonContextHolder());
+        thriftSession.setAttribute("carbonContextHolder",privilegedCarbonContext);
+        return privilegedCarbonContext;
     }
 
     /**
Index: src/main/java/org/wso2/carbon/context/internal/CarbonContextDataHolder.java
===================================================================
--- src/main/java/org/wso2/carbon/context/internal/CarbonContextDataHolder.java	(revision 144914)
+++ src/main/java/org/wso2/carbon/context/internal/CarbonContextDataHolder.java	(working copy)
@@ -521,7 +521,7 @@
         }
         CarbonContextDataHolder context = getClone();
         log.debug("Added CarbonContext to the Thrift Session");
-        thriftSession.setAttribute(CARBON_CONTEXT_HOLDER, context);
+       //thriftSession.setAttribute(CARBON_CONTEXT_HOLDER, context);
         return context;
     }