Security.java, [...]: Modified to use SystemProperties.

2005-04-26  Jeroen Frijters  <jeroen@frijters.net>

	* java/security/Security.java,
	java/security/cert/X509CRLSelector.java,
	java/security/cert/X509CertSelector.java:
	Modified to use SystemProperties.

From-SVN: r98764

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7be1ac0..ec44dd3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-26  Jeroen Frijters  <jeroen@frijters.net>
+
+       * java/security/Security.java,
+       java/security/cert/X509CRLSelector.java,
+       java/security/cert/X509CertSelector.java:
+       Modified to use SystemProperties.
+
 2005-04-26  Michael Koch  <konqueror@gmx.de>
 
        * java/lang/System.java

diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java
index 01c0a05..15b76c0 100644 (file)
--- a/libjava/java/security/Security.java
+++ b/libjava/java/security/Security.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package java.security;
 
-import gnu.java.security.action.GetPropertyAction;
+import gnu.classpath.SystemProperties;
 
 import gnu.classpath.Configuration;
 
@@ -71,10 +71,8 @@ public final class Security
   
   static
     {
-      GetPropertyAction getProp = new GetPropertyAction("gnu.classpath.home.url");
-      String base = (String) AccessController.doPrivileged(getProp);
-      getProp = new GetPropertyAction("gnu.classpath.vm.shortname");
-      String vendor = (String) AccessController.doPrivileged(getProp);
+      String base = SystemProperties.getProperty("gnu.classpath.home.url");
+      String vendor = SystemProperties.getProperty("gnu.classpath.vm.shortname");
 
       // Try VM specific security file
       boolean loaded = loadProviders (base, vendor);

diff --git a/libjava/java/security/cert/X509CRLSelector.java b/libjava/java/security/cert/X509CRLSelector.java
index 7ff8700..164fd66 100644 (file)
--- a/libjava/java/security/cert/X509CRLSelector.java
+++ b/libjava/java/security/cert/X509CRLSelector.java
@@ -38,14 +38,13 @@ exception statement from your version. */
 
 package java.security.cert;
 
-import gnu.java.security.action.GetPropertyAction;
+import gnu.classpath.SystemProperties;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -336,8 +335,7 @@ public class X509CRLSelector implements CRLSelector, Cloneable
   public String toString()
   {
     StringBuffer str = new StringBuffer(X509CRLSelector.class.getName());
-    GetPropertyAction getProp = new GetPropertyAction("line.separator");
-    String nl = (String) AccessController.doPrivileged(getProp);
+    String nl = SystemProperties.getProperty("line.separator");
     String eol = ";" + nl;
 
     str.append(" {").append(nl);

diff --git a/libjava/java/security/cert/X509CertSelector.java b/libjava/java/security/cert/X509CertSelector.java
index 0463142..d955419 100644 (file)
--- a/libjava/java/security/cert/X509CertSelector.java
+++ b/libjava/java/security/cert/X509CertSelector.java
@@ -38,12 +38,11 @@ exception statement from your version. */
 
 package java.security.cert;
 
+import gnu.classpath.SystemProperties;
 import gnu.java.security.OID;
-import gnu.java.security.action.GetPropertyAction;
 
 import java.io.IOException;
 import java.math.BigInteger;
-import java.security.AccessController;
 import java.security.KeyFactory;
 import java.security.PublicKey;
 import java.security.spec.X509EncodedKeySpec;
@@ -1024,8 +1023,7 @@ public class X509CertSelector implements CertSelector, Cloneable
   public String toString()
   {
     StringBuffer str = new StringBuffer(X509CertSelector.class.getName());
-    GetPropertyAction getProp = new GetPropertyAction("line.separator");
-    String nl = (String) AccessController.doPrivileged(getProp);
+    String nl = SystemProperties.getProperty("line.separator");
     String eol = ";" + nl;
     str.append(" {").append(nl);
     if (cert != null)