--- old/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java	2015-07-18 15:41:48.921999012 +0100
+++ new/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java	2015-07-18 15:41:48.789998853 +0100
@@ -119,16 +119,16 @@
         for (int i=channelOffset; i<totalChannels; i++) {
             int rOps = pollWrapper.getReventOps(i);
             if (rOps != 0) {
-                SelectionKeyImpl sk = channelArray[i];
+                SelectionKeyImpl ski = channelArray[i];
                 pollWrapper.putReventOps(i, 0);
-                if (selectedKeys.contains(sk)) {
-                    if (sk.channel.translateAndSetReadyOps(rOps, sk)) {
+                if (selectedKeys.contains(ski)) {
+                    if (ski.channel.translateAndSetReadyOps(rOps, ski)) {
                         numKeysUpdated++;
                     }
                 } else {
-                    sk.channel.translateAndSetReadyOps(rOps, sk);
-                    if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0) {
-                        selectedKeys.add(sk);
+                    ski.channel.translateAndSetReadyOps(rOps, ski);
+                    if (ski.hasOps()) {
+                        selectedKeys.add(ski);
                         numKeysUpdated++;
                     }
                 }