Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 4 insertions, 4 deletions

diff --git a/libjava/classpath/gnu/java/security/action/GetPropertyAction.java b/libjava/classpath/gnu/java/security/action/GetPropertyAction.java
index 2886deb3474..0c8141a4d9b 100644
--- a/libjava/classpath/gnu/java/security/action/GetPropertyAction.java
+++ b/libjava/classpath/gnu/java/security/action/GetPropertyAction.java
@@ -49,7 +49,7 @@ import java.security.PrivilegedAction;
  * String port = AccessController.doPrivileged(action);
  * </code>
  */
-public class GetPropertyAction implements PrivilegedAction
+public class GetPropertyAction implements PrivilegedAction<String>
 {
   String name;
   String value = null;
@@ -68,7 +68,7 @@ public class GetPropertyAction implements PrivilegedAction
     setParameters(propName, defaultValue);
   }
   
-  public Object run()
+  public String run()
   {
     return System.getProperty(name, value);
   }
diff --git a/libjava/classpath/gnu/java/security/action/GetSecurityPropertyAction.java b/libjava/classpath/gnu/java/security/action/GetSecurityPropertyAction.java
index 97fa15d03e5..ac928ca336f 100644
--- a/libjava/classpath/gnu/java/security/action/GetSecurityPropertyAction.java
+++ b/libjava/classpath/gnu/java/security/action/GetSecurityPropertyAction.java
@@ -50,7 +50,7 @@ import java.security.Security;
  * String passwd = AccessController.doPrivileged(action);
  * </code>
  */
-public class GetSecurityPropertyAction implements PrivilegedAction
+public class GetSecurityPropertyAction implements PrivilegedAction<String>
 {
   private String name;
   private String value;
@@ -83,7 +83,7 @@ public class GetSecurityPropertyAction implements PrivilegedAction
     return this;
   }
 
-  public Object run()
+  public String run()
   {
     String val = Security.getProperty(name);
     if (val == null)