--- old/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java	2011-07-27 17:19:50.302748200 -0700
+++ new/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java	2011-07-27 17:19:49.658683800 -0700
@@ -28,6 +28,7 @@
 import java.util.Vector;
 import javax.naming.*;
 import javax.naming.directory.*;
+import javax.naming.ldap.Control;
 import javax.naming.spi.*;
 
 import com.sun.jndi.toolkit.ctx.Continuation;
@@ -40,8 +41,8 @@
         super(homeCtx, answer, remain, cont);
     }
 
-    protected NameClassPair
-      createItem(String dn, Attributes attrs, Vector respCtls)
+    protected Binding
+      createItem(String dn, Attributes attrs, Vector<Control> respCtls)
         throws NamingException {
 
         Object obj = null;
@@ -85,9 +86,10 @@
         return binding;
     }
 
-    protected LdapNamingEnumeration
+    protected LdapBindingEnumeration
     getReferredResults(LdapReferralContext refCtx) throws NamingException{
         // repeat the original operation at the new context
-        return (LdapNamingEnumeration) refCtx.listBindings(listArg);
+        return (LdapBindingEnumeration)(NamingEnumeration)
+                refCtx.listBindings(listArg);
     }
 }