From fcb4e2ef922062d2de67ef10e1a57bc4629d2ff1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 18 Oct 2001 00:01:49 +0000 Subject: 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 --- libjava/java/security/Security.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'libjava/java/security/Security.java') diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java index 1de341c..373637a 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 -- cgit v1.1