You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2023/02/01 21:33:56 UTC
[hadoop] branch branch-3.3 updated: HADOOP-18279. Cancel fileMonitoringTimer even if trustManager isn't defined (#4789)
This is an automated email from the ASF dual-hosted git repository.
sunchao pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 7b6a69faaac HADOOP-18279. Cancel fileMonitoringTimer even if trustManager isn't defined (#4789)
7b6a69faaac is described below
commit 7b6a69faaac4af36dd5f58d308d8591e7373ae7b
Author: Steve Vaughan <em...@stevevaughan.me>
AuthorDate: Wed Feb 1 16:33:34 2023 -0500
HADOOP-18279. Cancel fileMonitoringTimer even if trustManager isn't defined (#4789)
Co-authored-by: Steve Vaughan Jr <s_...@apple.com>
---
.../org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 236d881581d..401509a40b1 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 @@ public class FileBasedKeyStoresFactory implements KeyStoresFactory {
*/
@Override
public synchronized void destroy() {
- if (trustManager != null) {
+ if (fileMonitoringTimer != null) {
fileMonitoringTimer.cancel();
+ }
+ if (trustManager != null) {
trustManager = null;
keyManagers = null;
trustManagers = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org