prevent concurrent token read / refresh (openhab#4686)

andrewfg · web-flow · commit 1960646a6d9d · 2025-03-29T18:09:33.000+01:00
Signed-off-by: Andrew Fiddian-Green &lt;software@whitebear.ch&gt;
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java
@@ -291,7 +291,7 @@ public AccessTokenResponse getAccessTokenByClientCredentials(@Nullable String sc
     }
 
     @Override
-    public AccessTokenResponse refreshToken() throws OAuthException, IOException, OAuthResponseException {
+    public synchronized AccessTokenResponse refreshToken() throws OAuthException, IOException, OAuthResponseException {
         if (isClosed()) {
             throw new OAuthException(EXCEPTION_MESSAGE_CLOSED);
         }
@@ -333,7 +333,7 @@ public AccessTokenResponse refreshToken() throws OAuthException, IOException, OA
     }
 
     @Override
-    public @Nullable AccessTokenResponse getAccessTokenResponse()
+    public synchronized @Nullable AccessTokenResponse getAccessTokenResponse()
             throws OAuthException, IOException, OAuthResponseException {
         if (isClosed()) {
             throw new OAuthException(EXCEPTION_MESSAGE_CLOSED);

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ public AccessTokenResponse getAccessTokenByClientCredentials(@Nullable String sc`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`@Override`
`294`		`- public AccessTokenResponse refreshToken() throws OAuthException, IOException, OAuthResponseException {`
	`294`	`+ public synchronized AccessTokenResponse refreshToken() throws OAuthException, IOException, OAuthResponseException {`
`295`	`295`	`if (isClosed()) {`
`296`	`296`	`throw new OAuthException(EXCEPTION_MESSAGE_CLOSED);`
`297`	`297`	`}`
`@@ -333,7 +333,7 @@ public AccessTokenResponse refreshToken() throws OAuthException, IOException, OA`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`@Override`
`336`		`- public @Nullable AccessTokenResponse getAccessTokenResponse()`
	`336`	`+ public synchronized @Nullable AccessTokenResponse getAccessTokenResponse()`
`337`	`337`	`throws OAuthException, IOException, OAuthResponseException {`
`338`	`338`	`if (isClosed()) {`
`339`	`339`	`throw new OAuthException(EXCEPTION_MESSAGE_CLOSED);`