Merged gcj-eclipse branch to trunk.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java
index b455dbb6c24..3c8b64d4c99 100644
--- a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java
+++ b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java
@@ -56,7 +56,7 @@ public class AppConfigurationEntry
 
   public AppConfigurationEntry (final String loginModuleName,
                                 final LoginModuleControlFlag controlFlag,
-                                final Map options)
+                                final Map<String, ?> options)
   {
     if (loginModuleName == null || loginModuleName.length() == 0)
       throw new IllegalArgumentException ("module name cannot be null nor empty");
@@ -88,7 +88,7 @@ public class AppConfigurationEntry
     return loginModuleName;
   }
 
-  public Map getOptions()
+  public Map<String, ?> getOptions()
   {
     return options;
   }