From b476482197c60b00964769d357741be8d65734d2 Mon Sep 17 00:00:00 2001 From: Vinnie Ryan Date: Mon, 31 Aug 2015 10:14:34 +0100 Subject: [PATCH] 8130800: KeyStore.getInstance(File,char[]) does not throw IOE for null password Reviewed-by: weijun, mullan --- .../java.base/share/classes/java/security/KeyStore.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/security/KeyStore.java b/jdk/src/java.base/share/classes/java/security/KeyStore.java index 75b64ab337a..34e0bf95120 100644 --- a/jdk/src/java.base/share/classes/java/security/KeyStore.java +++ b/jdk/src/java.base/share/classes/java/security/KeyStore.java @@ -1611,8 +1611,13 @@ public class KeyStore { * First the keystore type is determined by probing the specified file. * Then a keystore object is instantiated and loaded using the data from * that file. - * A password may be supplied to unlock the keystore data or perform an - * integrity check. + * + *

+ * A password may be given to unlock the keystore + * (e.g. the keystore resides on a hardware token device), + * or to check the integrity of the keystore data. + * If a password is not given for integrity checking, + * then integrity checking is not performed. * *

* This method traverses the list of registered security