src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java

rev 48074 : 8192987: keytool should remember real storetype if it is not provided

@@ -91,12 +91,13 @@
     /**
      * Returns true if KeyStore has a password. This is true except for
      * MSCAPI KeyStores
      */
     public static boolean isWindowsKeyStore(String storetype) {
-        return storetype.equalsIgnoreCase("Windows-MY")
-                || storetype.equalsIgnoreCase("Windows-ROOT");
+        return storetype != null
+                && (storetype.equalsIgnoreCase("Windows-MY")
+                    || storetype.equalsIgnoreCase("Windows-ROOT"));
     }
 
     /**
      * Returns standard-looking names for storetype
      */