Repository: hadoop Updated Branches: refs/heads/branch-2 804a40720 -> 3f3957ad6
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/3f3957ad Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3f3957ad Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3f3957ad Branch: refs/heads/branch-2 Commit: 3f3957ad66b76619fd6187de40bdd8f4c0e84a70 Parents: 804a407 Author: Mingliang Liu <[email protected]> Authored: Thu Aug 18 00:04:58 2016 -0700 Committer: Mingliang Liu <[email protected]> Committed: Thu Aug 18 14:15:01 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/3f3957ad/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: [email protected] For additional commands, e-mail: [email protected]
