diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-18 00:01:49 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-18 00:01:49 +0000 |
| commit | a0fec9a202e2373129d089fe3214f7cd74fdd351 (patch) | |
| tree | 8f37d7d2c57fc8c14c742aa92aaedbfe540b87e9 | |
| parent | c05c2095c7cd1038cabea3d8e40de10a50b97d0d (diff) | |
| download | ppe42-gcc-a0fec9a202e2373129d089fe3214f7cd74fdd351.tar.gz ppe42-gcc-a0fec9a202e2373129d089fe3214f7cd74fdd351.zip | |
* java/security/Security.java (loadProviders): Added `vendor'
argument.
Load both `classpath' and `java.vm.name' providers.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46325 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/security/Security.java | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 91c0789e805..af82b9b33aa 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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> * java/security/Security.java (loadProviders): Fix bug in how diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java index 1de341c03ca..373637add8c 100644 --- a/libjava/java/security/Security.java +++ b/libjava/java/security/Security.java @@ -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 |
