2 files changed, 32 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ec44dd3..ddabdc9 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,15 @@
 2005-04-26  Jeroen Frijters  <jeroen@frijters.net>
 
+	* gnu/java/security/action/GetSecurityPropertyAction.java
+	(GetSecurityPropertyAction): Implement PrivilegedAction instead
+	of extending GetPropertyAction.
+	(name): New field.
+	(value): Likewise.
+	(setParamters): New methods.
+	(GetSecurityPropertyAction): Use new setParameters methods.
+
+2005-04-26  Jeroen Frijters  <jeroen@frijters.net>
+
 	* java/security/Security.java,
 	java/security/cert/X509CRLSelector.java,
 	java/security/cert/X509CertSelector.java:
diff --git a/libjava/gnu/java/security/action/GetSecurityPropertyAction.java b/libjava/gnu/java/security/action/GetSecurityPropertyAction.java
index 01aab81..b61e9c8 100644
--- a/libjava/gnu/java/security/action/GetSecurityPropertyAction.java
+++ b/libjava/gnu/java/security/action/GetSecurityPropertyAction.java
@@ -50,25 +50,42 @@ import java.security.Security;
  * String passwd = AccessController.doPrivileged(action);
  * </code>
  */
-public class GetSecurityPropertyAction extends GetPropertyAction
+public class GetSecurityPropertyAction implements PrivilegedAction
 {
+  private String name;
+  private String value;
+
   public GetSecurityPropertyAction()
   {
   }
 
-  public GetSecurityPropertyAction (String propName)
+  public GetSecurityPropertyAction(String propName)
   {
-    super (propName);
+    setParameters(propName);
   }
 
   public GetSecurityPropertyAction(String propName, String defaultValue)
   {
-    super (propName, defaultValue);
+    setParameters(propName, defaultValue);
+  }
+
+  public GetSecurityPropertyAction setParameters(String propName)
+  {
+    this.name = propName;
+    this.value = null;
+    return this;
+  }
+
+  public GetSecurityPropertyAction setParameters(String propName, String defaultValue)
+  {
+    this.name = propName;
+    this.value = defaultValue;
+    return this;
   }
 
   public Object run()
   {
-    String val = Security.getProperty (name);
+    String val = Security.getProperty(name);
     if (val == null)
       val = value;
     return val;