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, 3 insertions, 3 deletions

diff --git a/libjava/classpath/javax/security/sasl/SaslClientFactory.java b/libjava/classpath/javax/security/sasl/SaslClientFactory.java
index ae36171c56e..be80fd9f1c9 100644
--- a/libjava/classpath/javax/security/sasl/SaslClientFactory.java
+++ b/libjava/classpath/javax/security/sasl/SaslClientFactory.java
@@ -97,8 +97,8 @@ public interface SaslClientFactory
    * because of an error.
    */
   SaslClient createSaslClient(String[] mechanisms, String authorizationID,
-                              String protocol, String serverName, Map props,
-                              CallbackHandler cbh)
+                              String protocol, String serverName,
+                              Map<String, ?> props, CallbackHandler cbh)
     throws SaslException;
 
   /**
@@ -114,5 +114,5 @@ public interface SaslClientFactory
    * properties, if present in props, are ignored.
    * @return a non-null array containing IANA-registered SASL mechanism names.
    */
-  String[] getMechanismNames(Map props);
+  String[] getMechanismNames(Map<String, ?> props);
 }