Please take a review at http://cr.openjdk.java.net/~weijun/8207318/webrev.00/
Here, when hasPassword is true, KeyStore::load(ins,pass) is implemented as keyStoreSpi.engineLoad(stream, password); initialized = true; so I simply add the same "initialized = true" to the else block. The ProbeKeystores.java test is updated with a size() call after getInstance(File,...) to ensure the keystore is loaded successfully. Thanks Max