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

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 ()