diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-12-06 15:03:48 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-12-06 15:03:48 +0100 |
commit | f1fbd499da784fef06ef4f3bcaedf32d3ecc394a (patch) | |
tree | df6e2e68f658be03a8eff9441e144333c607f71b /athenz-identity-provider-service/src | |
parent | 7da97d9ff23a5bfa9e9270b01adf28d2f4a6a8ab (diff) |
Remove unnecessary use of AtomicReference
Diffstat (limited to 'athenz-identity-provider-service/src')
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzSslKeyStoreConfigurator.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzSslKeyStoreConfigurator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzSslKeyStoreConfigurator.java index 2492e8fddf2..706f797cd2c 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzSslKeyStoreConfigurator.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzSslKeyStoreConfigurator.java @@ -23,7 +23,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Logger; import static com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl.Utils.getZoneConfig; @@ -45,7 +44,7 @@ public class AthenzSslKeyStoreConfigurator extends AbstractComponent implements private final KeyProvider keyProvider; private final AthenzProviderServiceConfig.Zones zoneConfig; private final AtomicBoolean alreadyConfigured = new AtomicBoolean(); - private final AtomicReference<KeyStore> initialKeyStore = new AtomicReference<>(); + private KeyStore initialKeyStore; @Inject public AthenzSslKeyStoreConfigurator(KeyProvider keyProvider, @@ -55,7 +54,7 @@ public class AthenzSslKeyStoreConfigurator extends AbstractComponent implements this.certificateClient = new AthenzCertificateClient(config, zoneConfig); this.keyProvider = keyProvider; this.zoneConfig = zoneConfig; - this.initialKeyStore.set(downloadCertificate(keyProvider, certificateClient, zoneConfig)); + this.initialKeyStore = downloadCertificate(keyProvider, certificateClient, zoneConfig); } @Override @@ -63,7 +62,8 @@ public class AthenzSslKeyStoreConfigurator extends AbstractComponent implements if (alreadyConfigured.getAndSet(true)) { // For debugging purpose of SslKeyStoreConfigurator interface throw new IllegalStateException("Already configured. configure() can only be called once."); } - sslKeyStoreContext.updateKeyStore(initialKeyStore.getAndSet(null), DUMMY_PASSWORD); + sslKeyStoreContext.updateKeyStore(initialKeyStore, DUMMY_PASSWORD); + initialKeyStore = null; scheduler.scheduleAtFixedRate(new AthenzCertificateUpdater(sslKeyStoreContext), CERTIFICATE_UPDATE_PERIOD.toMinutes()/*initial delay*/, CERTIFICATE_UPDATE_PERIOD.toMinutes(), |