diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-09 19:58:05 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-09 19:58:05 +0000 |
| commit | 65bf3316cf384588453604be6b4f0ed3751a8b0f (patch) | |
| tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/classpath/javax/naming/ldap | |
| parent | 8fc56618a84446beccd45b80381cdfe0e94050df (diff) | |
| download | ppe42-gcc-65bf3316cf384588453604be6b4f0ed3751a8b0f.tar.gz ppe42-gcc-65bf3316cf384588453604be6b4f0ed3751a8b0f.zip | |
Merged gcj-eclipse branch to trunk.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/javax/naming/ldap')
3 files changed, 11 insertions, 8 deletions
diff --git a/libjava/classpath/javax/naming/ldap/ControlFactory.java b/libjava/classpath/javax/naming/ldap/ControlFactory.java index f72e67a7587..b8151640fc6 100644 --- a/libjava/classpath/javax/naming/ldap/ControlFactory.java +++ b/libjava/classpath/javax/naming/ldap/ControlFactory.java @@ -59,7 +59,7 @@ public abstract class ControlFactory public static Control getControlInstance (Control control, Context ctx, - Hashtable env) + Hashtable<?, ?> env) throws NamingException { String path = (String) env.get (LdapContext.CONTROL_FACTORIES); diff --git a/libjava/classpath/javax/naming/ldap/InitialLdapContext.java b/libjava/classpath/javax/naming/ldap/InitialLdapContext.java index 45a9eae1af5..f9493c3b29c 100644 --- a/libjava/classpath/javax/naming/ldap/InitialLdapContext.java +++ b/libjava/classpath/javax/naming/ldap/InitialLdapContext.java @@ -60,22 +60,24 @@ public class InitialLdapContext this (null, null); } - public InitialLdapContext (Hashtable environment, Control[] connControls) + public InitialLdapContext (Hashtable<?, ?> environment, + Control[] connControls) throws NamingException { super (false); + Hashtable myenv = null; if (connControls != null) { if (environment == null) - environment = new Hashtable (); + myenv = new Hashtable (); else - environment = (Hashtable) environment.clone (); - environment.put ("java.naming.ldap.control.connect", + myenv = (Hashtable) environment.clone (); + myenv.put ("java.naming.ldap.control.connect", connControls); } - init (environment); + init (myenv); } private LdapContext getDefaultInitLdapCtx () diff --git a/libjava/classpath/javax/naming/ldap/LdapReferralException.java b/libjava/classpath/javax/naming/ldap/LdapReferralException.java index 61a2b8e440c..87942b9fce4 100644 --- a/libjava/classpath/javax/naming/ldap/LdapReferralException.java +++ b/libjava/classpath/javax/naming/ldap/LdapReferralException.java @@ -61,8 +61,9 @@ public abstract class LdapReferralException extends ReferralException } public abstract Context getReferralContext() throws NamingException; - public abstract Context getReferralContext(Hashtable env) + public abstract Context getReferralContext(Hashtable<?, ?> env) throws NamingException; - public abstract Context getReferralContext(Hashtable env, Control[] reqCtls) + public abstract Context getReferralContext(Hashtable<?, ?> env, + Control[] reqCtls) throws NamingException; } |
