Security.java (loadProviders): Added `vendor' argument.
* java/security/Security.java (loadProviders): Added `vendor' argument. Load both `classpath' and `java.vm.name' providers. From-SVN: r46325
This commit is contained in:
parent
516b69ff81
commit
fcb4e2ef92
2 changed files with 16 additions and 5 deletions
|
@ -49,7 +49,8 @@ public final class Security extends Object
|
|||
|
||||
static
|
||||
{
|
||||
loadProviders();
|
||||
loadProviders(System.getProperty("java.vm.name"));
|
||||
loadProviders("classpath");
|
||||
}
|
||||
|
||||
// This class can't be instantiated.
|
||||
|
@ -57,12 +58,16 @@ public final class Security extends Object
|
|||
{
|
||||
}
|
||||
|
||||
private static void loadProviders()
|
||||
private static void loadProviders(String vendor)
|
||||
{
|
||||
if (vendor == null)
|
||||
return;
|
||||
|
||||
String separator = System.getProperty("file.separator");
|
||||
String secfilestr = System.getProperty("java.home") +
|
||||
separator + "lib" + separator + "security" + separator +
|
||||
"classpath.security";
|
||||
String secfilestr = (System.getProperty("java.home") +
|
||||
separator + "lib" +
|
||||
separator + "security" +
|
||||
separator + vendor + ".security");
|
||||
|
||||
providerCount = 0;
|
||||
try
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue