INTGW-584 - code refactoring

WSO2Telco · Jun 28, 2019 · a6f8a40 · a6f8a40
1 parent 7feb13e
commit a6f8a40
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...ator/src/main/java/com/wso2telco/dep/tokenregenerator/TokenRegenerationEventListener.java b/...ator/src/main/java/com/wso2telco/dep/tokenregenerator/TokenRegenerationEventListener.java
@@ -67,6 +67,10 @@ public boolean doPostUpdateCredential(String userName, Object credential, UserSt
             log.debug("Username : "+ userName);
         }
 
+        String threadLocalUsername = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
+        String threadTenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
+        final int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+
         try {
             startTenantFlow(userName);
 
@@ -91,7 +95,7 @@ public boolean doPostUpdateCredential(String userName, Object credential, UserSt
         } catch (IdentityOAuthAdminException e) {
             log.error("Error while Fetching application details ", e);
         } finally {
-            endTenantFlow();
+            endTenantFlow(threadLocalUsername, threadTenantDomain,tenantId);
         }
 
         return true;
@@ -146,11 +150,7 @@ private OAuthClientAuthnContext getOAuthClientAuthnContext(OAuthConsumerAppDTO o
         return oAuthClientAuthnContext;
     }
 
-    private void endTenantFlow() {
-        String threadLocalUsername = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
-        String threadTenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
-        final int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-
+    private void endTenantFlow(String threadLocalUsername, String threadTenantDomain, int tenantId) {
         PrivilegedCarbonContext.endTenantFlow();
         PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(threadLocalUsername);
         PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(threadTenantDomain);