FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Security.java (loadProviders): Added `vendor' argument.

Browse source 
* java/security/Security.java (loadProviders): Added `vendor'
	argument.
	Load both `classpath' and `java.vm.name' providers.

From-SVN: r46325
This commit is contained in:
Tom Tromey 2001-10-18 00:01:49 +00:00 • committed by Tom Tromey
parent 516b69ff81
commit fcb4e2ef92
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/ChangeLog
View file

@ -1,3 +1,9 @@
2001-10-17 Tom Tromey <tromey@redhat.com>
* java/security/Security.java (loadProviders): Added `vendor'
argument.
Load both `classpath' and `java.vm.name' providers.
2001-10-17 Anthony Green <green@redhat.com> 2001-10-17 Anthony Green <green@redhat.com>
* java/security/Security.java (loadProviders): Fix bug in how * java/security/Security.java (loadProviders): Fix bug in how

15
libjava/java/security/Security.java
View file

@ -49,7 +49,8 @@ public final class Security extends Object
static static
{ {
loadProviders(); loadProviders(System.getProperty("java.vm.name"));
loadProviders("classpath");
} }
// This class can't be instantiated. // 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 separator = System.getProperty("file.separator");
String secfilestr = System.getProperty("java.home") + String secfilestr = (System.getProperty("java.home") +
separator + "lib" + separator + "security" + separator + separator + "lib" +
"classpath.security"; separator + "security" +
separator + vendor + ".security");
providerCount = 0; providerCount = 0;
try try