libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

KEYCLOAK-5617 Intermittent ConcurrencyTest failures

Browse source
This commit is contained in:
Marko Strukelj 2017-11-08 11:07:07 +01:00 committed by Stian Thorgersen
parent 9243430b75
commit bf937452c6
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java
View file

@ -92,7 +92,7 @@ public class TokenManager {
return currentToken; return currentToken;
} }
public AccessTokenResponse refreshToken() { public synchronized AccessTokenResponse refreshToken() {
Form form = new Form().param(GRANT_TYPE, REFRESH_TOKEN) Form form = new Form().param(GRANT_TYPE, REFRESH_TOKEN)
.param(REFRESH_TOKEN, currentToken.getRefreshToken()); .param(REFRESH_TOKEN, currentToken.getRefreshToken());
@ -103,10 +103,8 @@ public class TokenManager {
try { try {
int requestTime = Time.currentTime(); int requestTime = Time.currentTime();
synchronized (this) { currentToken = tokenService.refreshToken(config.getRealm(), form.asMap());
currentToken = tokenService.refreshToken(config.getRealm(), form.asMap()); expirationTime = requestTime + currentToken.getExpiresIn();
expirationTime = requestTime + currentToken.getExpiresIn();
}
return currentToken; return currentToken;
} catch (BadRequestException e) { } catch (BadRequestException e) {
return grantToken(); return grantToken();
@ -126,7 +124,7 @@ public class TokenManager {
* *
* @param token the token to invalidate (cannot be null). * @param token the token to invalidate (cannot be null).
*/ */
public void invalidate(String token) { public synchronized void invalidate(String token) {
if (currentToken == null) { if (currentToken == null) {
return; // There's nothing to invalidate. return; // There's nothing to invalidate.
} }