HADOOP-13512. ReloadingX509TrustManager should keep reloading in case of exception. (Contributed by Mingliang Liu)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f51eae0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f51eae0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f51eae0 Branch: refs/heads/HDFS-9806 Commit: 0f51eae0c085ded38216824377acf8122638c3a5 Parents: ae4db25 Author: Mingliang Liu <lium...@apache.org> Authored: Thu Aug 18 00:04:58 2016 -0700 Committer: Mingliang Liu <lium...@apache.org> Committed: Thu Aug 18 14:10:37 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f51eae0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java index bb90a61..597f8d7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java @@ -165,10 +165,10 @@ public final class ReloadingX509TrustManager throws IOException, GeneralSecurityException { X509TrustManager trustManager = null; KeyStore ks = KeyStore.getInstance(type); - lastLoaded = file.lastModified(); FileInputStream in = new FileInputStream(file); try { ks.load(in, password.toCharArray()); + lastLoaded = file.lastModified(); LOG.debug("Loaded truststore '" + file + "'"); } finally { in.close(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
