diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-14 13:23:22 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-14 13:23:22 +0100 |
commit | ad3d2e3a9aa89b3248db02a7929a737ea790497d (patch) | |
tree | d5dfa8fb6aaf138994476bab2d1839b09f5d55d7 /security-utils/src/main/java/com/yahoo/security/tls/ConfigFileBasedTlsContext.java | |
parent | 6564d646f807bb23e725ffe9310e030259eeedc6 (diff) |
Revert "Use reference counting to avoid relying on GC to drop threads."
This reverts commit 1c6c89eb52ac80c583c0cd90efdd0784344af434.
Diffstat (limited to 'security-utils/src/main/java/com/yahoo/security/tls/ConfigFileBasedTlsContext.java')
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/ConfigFileBasedTlsContext.java | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/ConfigFileBasedTlsContext.java b/security-utils/src/main/java/com/yahoo/security/tls/ConfigFileBasedTlsContext.java index 9527d50f339..26dfbf9fd9f 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/ConfigFileBasedTlsContext.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/ConfigFileBasedTlsContext.java @@ -31,17 +31,13 @@ public class ConfigFileBasedTlsContext implements TlsContext { private static TlsManager getOrCreateTrustManager(Path tlsOptionsConfigFile) { synchronized (trustManagers) { - WeakReference<TlsManager> tlsRef = trustManagers.get(tlsOptionsConfigFile); - TlsManager tlsManager = null; - if (tlsRef != null) { - tlsManager = tlsRef.get(); + WeakReference<TlsManager> tlsManager = trustManagers.get(tlsOptionsConfigFile); + if (tlsManager == null || tlsManager.get() == null) { + TlsManager manager = new TlsManager(tlsOptionsConfigFile); + trustManagers.put(tlsOptionsConfigFile, new WeakReference<>(manager)); + return manager; } - if (tlsManager == null) { - tlsManager = new TlsManager(tlsOptionsConfigFile); - trustManagers.put(tlsOptionsConfigFile, new WeakReference<>(tlsManager)); - } - tlsManager.addRef(); - return tlsManager; + return tlsManager.get(); } } @@ -63,15 +59,6 @@ public class ConfigFileBasedTlsContext implements TlsContext { @Override public SSLParameters parameters() { return tlsContext.parameters(); } @Override public SSLEngine createSslEngine() { return tlsContext.createSslEngine(); } @Override public SSLEngine createSslEngine(String peerHost, int peerPort) { return tlsContext.createSslEngine(peerHost, peerPort); } - @Override public void close() { - synchronized (trustManagers) { - int references = tlsManager.subRef(); - if (references == 0) { - tlsManager.close(); - trustManagers.remove(tlsManager.getTlsConfigFile()); - } - } - } private static DefaultTlsContext createDefaultTlsContext(TransportSecurityOptions options, AuthorizationMode mode, |