infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-25 23:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

8069277: Doclint regression in java/security/KeyStore.java

Browse Source 
Reviewed-by: weijun
This commit is contained in:
Joe Darcy 2015-02-09 17:49:26 -08:00
parent 0d5c151c94
commit 127d4e1aec
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jdk/src/java.base/share/classes/java/security/KeyStore.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -1618,11 +1618,13 @@ public class KeyStore {
* integrity check.
*
* <p>
* This method traverses the list of registered security {@link Providers},
* starting with the most preferred Provider.
* For each {@link KeyStoreSpi} implementation supported by a Provider,
* it invokes the {@link engineProbe} method to determine if it supports
* the specified keystore.
* This method traverses the list of registered security
* {@linkplain Provider providers}, starting with the most
* preferred Provider.
* For each {@link KeyStoreSpi} implementation supported by a
* Provider, it invokes the {@link
* KeyStoreSpi#engineProbe(InputStream) engineProbe} method to
* determine if it supports the specified keystore.
* A new KeyStore object is returned that encapsulates the KeyStoreSpi
* implementation from the first Provider that supports the specified file.
*
@ -1672,11 +1674,12 @@ public class KeyStore {
* unlock the keystore data or perform an integrity check.
*
* <p>
* This method traverses the list of registered security {@link Providers},
* starting with the most preferred Provider.
* For each {@link KeyStoreSpi} implementation supported by a Provider,
* it invokes the {@link engineProbe} method to determine if it supports
* the specified keystore.
* This method traverses the list of registered security {@linkplain
* Provider providers}, starting with the most preferred Provider.
* For each {@link KeyStoreSpi} implementation supported by a
* Provider, it invokes the {@link
* KeyStoreSpi#engineProbe(InputStream) engineProbe} method to
* determine if it supports the specified keystore.
* A new KeyStore object is returned that encapsulates the KeyStoreSpi
* implementation from the first Provider that supports the specified file.
*