--- old/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java	2018-02-07 11:23:41.000000000 +0000
+++ new/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java	2018-02-07 11:23:40.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -42,7 +42,7 @@
     private final EventPortWrapper pollWrapper;
 
     // Maps from file descriptors to keys
-    private Map<Integer,SelectionKeyImpl> fdToKey;
+    private final Map<Integer,SelectionKeyImpl> fdToKey;
 
     // True if this Selector has been closed
     private boolean closed = false;
@@ -116,7 +116,7 @@
         }
 
         pollWrapper.close();
-        selectedKeys = null;
+        selectedKeys.clear();
 
         // Deregister channels
         Iterator<SelectionKey> i = keys.iterator();
@@ -145,7 +145,7 @@
         ski.setIndex(-1);
         keys.remove(ski);
         selectedKeys.remove(ski);
-        deregister((AbstractSelectionKey)ski);
+        deregister(ski);
         SelectableChannel selch = ski.channel();
         if (!selch.isOpen() && !selch.isRegistered())
             ((SelChImpl)selch).kill();