Making token fetch thread safe

AsabuHere · AsabuHere · commit fd9731abf81c · 2024-06-21T11:10:18.000-06:00
diff --git a/src/main/java/com/twilio/http/bearertoken/BearerTokenTwilioRestClient.java b/src/main/java/com/twilio/http/bearertoken/BearerTokenTwilioRestClient.java
@@ -110,7 +110,9 @@ public Response request(BearerTokenRequest request) {
 
         if (accessToken == null || accessToken.isEmpty() || isTokenExpired(this.accessToken)) {
             synchronized (BearerTokenTwilioRestClient.class){
-                this.accessToken = tokenManager.fetchAccessToken();
+                if (accessToken == null || accessToken.isEmpty() || isTokenExpired(this.accessToken)) {
+                    this.accessToken = tokenManager.fetchAccessToken();
+                }
             }
         }
         

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,9 @@ public Response request(BearerTokenRequest request) {`
`110`	`110`
`111`	`111`	`if (accessToken == null \|\| accessToken.isEmpty() \|\| isTokenExpired(this.accessToken)) {`
`112`	`112`	`synchronized (BearerTokenTwilioRestClient.class){`
`113`		`- this.accessToken = tokenManager.fetchAccessToken();`
	`113`	`+ if (accessToken == null \|\| accessToken.isEmpty() \|\| isTokenExpired(this.accessToken)) {`
	`114`	`+ this.accessToken = tokenManager.fetchAccessToken();`
	`115`	`+ }`
`114`	`116`	`}`
`115`	`117`	`}`
`116`	`118`