--- old/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java	2012-01-29 19:33:32.000000000 -0800
+++ new/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java	2012-01-29 19:33:32.000000000 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -494,7 +494,7 @@
             if (myEnv == null) {
                 return null;
             }
-            myEnv = (Hashtable<String, Object>)myEnv.clone();
+            myEnv = myEnv.clone();
             return myEnv.remove(propName);
     }
 
@@ -503,7 +503,7 @@
         throws NamingException {
             myEnv = (myEnv == null)
                     ? new Hashtable<String, Object>(11, 0.75f)
-                    : (Hashtable<String, Object>)myEnv.clone();
+                    : myEnv.clone();
             return myEnv.put(propName, propVal);
     }
 
@@ -512,7 +512,7 @@
         if (myEnv == null) {
             return new Hashtable<>(5, 0.75f);
         } else {
-            return (Hashtable<String, Object>)myEnv.clone();
+            return myEnv.clone();
         }
     }