| commit | 17daad34d41272e41edff8eee9ec345c95e52690 | [log] [tgz] |
|---|---|---|
| author | Steve Vaughan <email@stevevaughan.me> | Mon Aug 22 15:22:23 2022 -0400 |
| committer | GitHub <noreply@github.com> | Mon Aug 22 12:22:23 2022 -0700 |
| tree | 8f2e8b967f8ed2c792877dddb2b77d5af203f196 | |
| parent | 231e095802bb2ccb0edb2ea3da30206f81d59bda [diff] |
HADOOP-18279. Cancel fileMonitoringTimer even if trustManager isn't defined (#4767)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java index 520047b..4fbb3c8 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java
@@ -319,8 +319,10 @@ */ @Override public synchronized void destroy() { - if (trustManager != null) { + if (fileMonitoringTimer != null) { fileMonitoringTimer.cancel(); + } + if (trustManager != null) { trustManager = null; keyManagers = null; trustManagers = null;