Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java

@@ -96,7 +96,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
             tokenInfo = tokenIssuerService.getToken(PASSWORD_GRANT_TYPE, username, password);
             tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
         }
-        synchronized(tokenInfo) {
+        synchronized(this) {
             if (System.currentTimeMillis() + refreshTimeOffset > tokenInfo.getExpires_in()) {
                 tokenInfo = tokenIssuerService.getToken(REFRESH_GRANT_TYPE, tokenInfo.getRefresh_token());
                 tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java

@@ -79,9 +79,11 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
             tokenInfo = tokenIssuerService.getToken(PASSWORD_GRANT_TYPE, username, password);
             tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
         }
-        if (System.currentTimeMillis() + refreshTimeOffset > tokenInfo.getExpires_in()) {
+        synchronized (this) {
-            tokenInfo = tokenIssuerService.getToken(REFRESH_GRANT_TYPE, tokenInfo.getRefresh_token());
+            if (System.currentTimeMillis() + refreshTimeOffset > tokenInfo.getExpires_in()) {
-            tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
+                tokenInfo = tokenIssuerService.getToken(REFRESH_GRANT_TYPE, tokenInfo.getRefresh_token());
+                tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
+            }
         }
         String headerValue = "Bearer " + tokenInfo.getAccess_token();
         template.header("Authorization", headerValue);