src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java

@@ -48,16 +48,16 @@
   * @author Rosanna Lee
   */
 final class NamingEventNotifier implements Runnable {
     private final static boolean debug = false;
 
-    private Vector namingListeners;
+    private Vector<NamingListener> namingListeners;
     private Thread worker;
     private LdapCtx context;
     private EventContext eventSrc;
     private EventSupport support;
-    private NamingEnumeration results;
+    private NamingEnumeration<SearchResult> results;
 
     // package private; used by EventSupport to remove it
     NotifierArgs info;
 
     NamingEventNotifier(EventSupport support, LdapCtx ctx, NotifierArgs info,

@@ -81,11 +81,11 @@
 
         // Add psearch control to existing list
         context = (LdapCtx)ctx.newInstance(new Control[]{psearch});
         eventSrc = ctx;
 
-        namingListeners = new Vector();
+        namingListeners = new Vector<>();
         namingListeners.addElement(firstListener);
 
         worker = Obj.helper.createThread(this);
         worker.setDaemon(true);  // not a user thread
         worker.start();

@@ -122,19 +122,20 @@
                 true, false, cont);
 
             // Change root of search results so that it will generate
             // names relative to the event context instead of that
             // named by nm
-            ((LdapSearchEnumeration)results).setStartName(context.currentParsedDN);
+            ((LdapSearchEnumeration)(NamingEnumeration)results)
+                    .setStartName(context.currentParsedDN);
 
             SearchResult si;
             Control[] respctls;
             EntryChangeResponseControl ec;
             long changeNum;
 
             while (results.hasMore()) {
-                si = (SearchResult)results.next();
+                si = results.next();
                 respctls = (si instanceof HasControls) ?
                     ((HasControls) si).getControls() : null;
 
                 if (debug) {
                     System.err.println("notifier: " + si);