big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-18279. Cancel fileMonitoringTimer even if trustManager isn't defined (#4767)

Browse Source
This commit is contained in:
Steve Vaughan 2022-08-22 15:22:23 -04:00 committed by GitHub
parent 231e095802
commit 17daad34d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java
View File

@ -319,8 +319,10 @@ String getPassword(Configuration conf, String alias, String defaultPass) {
*/ */
@Override @Override
public synchronized void destroy() { public synchronized void destroy() {
if (trustManager != null) { if (fileMonitoringTimer != null) {
fileMonitoringTimer.cancel(); fileMonitoringTimer.cancel();
}
if (trustManager != null) {
trustManager = null; trustManager = null;
keyManagers = null; keyManagers = null;
trustManagers = null; trustManagers = null;