From 60052ea3cd1c31860e6b2d6b2ab10324112cad0a Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 5 Mar 2018 14:03:20 -0800 Subject: [PATCH] Use brackets for each `if` statement [#155091700] https://www.pivotaltracker.com/story/show/155091700 --- .../identity/uaa/oauth/UaaTokenStore.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java index ee9a75cf722..36c579e308e 100644 --- a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java +++ b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenStore.java @@ -216,14 +216,16 @@ protected void performExpirationClean() { //check if we should expire again if ((System.currentTimeMillis()-last) > getExpirationTime()) { //avoid concurrent deletes from the same UAA - performance improvement - if (lastClean.compareAndSet(last, last+getExpirationTime())) try { - JdbcTemplate template = new JdbcTemplate(dataSource); - int expired = template.update(SQL_EXPIRE_STATEMENT, System.currentTimeMillis()); - logger.debug("[oauth_code] Removed "+expired+" expired entries."); - expired = template.update(SQL_CLEAN_STATEMENT, new Timestamp(System.currentTimeMillis()-LEGACY_CODE_EXPIRATION_TIME)); - logger.debug("[oauth_code] Removed "+expired+" old entries."); - } catch (DeadlockLoserDataAccessException e) { - logger.debug("[oauth code] Deadlock trying to expire entries, ignored."); + if (lastClean.compareAndSet(last, last+getExpirationTime())) { + try { + JdbcTemplate template = new JdbcTemplate(dataSource); + int expired = template.update(SQL_EXPIRE_STATEMENT, System.currentTimeMillis()); + logger.debug("[oauth_code] Removed "+expired+" expired entries."); + expired = template.update(SQL_CLEAN_STATEMENT, new Timestamp(System.currentTimeMillis()-LEGACY_CODE_EXPIRATION_TIME)); + logger.debug("[oauth_code] Removed "+expired+" old entries."); + } catch (DeadlockLoserDataAccessException e) { + logger.debug("[oauth code] Deadlock trying to expire entries, ignored."); + } } }