Index: 4.2.0/src/main/java/org/wso2/carbon/event/core/internal/builder/EventAxis2ConfigurationContextObserver.java
===================================================================
--- 4.2.0/src/main/java/org/wso2/carbon/event/core/internal/builder/EventAxis2ConfigurationContextObserver.java	(revision 183453)
+++ 4.2.0/src/main/java/org/wso2/carbon/event/core/internal/builder/EventAxis2ConfigurationContextObserver.java	(working copy)
@@ -25,7 +25,7 @@
     public void creatingConfigurationContext(int tenantId) {
         try {
             PrivilegedCarbonContext.startTenantFlow();
-            PrivilegedCarbonContext.getCurrentContext().setTenantId(tenantId, true);
+            PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenantId, true);
             if (!this.loadedTenants.contains(tenantId)) {
                 this.eventBroker.initializeTenant();
                 this.loadedTenants.add(tenantId);