--- old/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java	2015-07-18 15:41:50.586001007 +0100
+++ new/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java	2015-07-18 15:41:50.458000853 +0100
@@ -28,8 +28,7 @@
 import java.io.IOException;
 import java.nio.channels.*;
 import java.nio.channels.spi.*;
-import java.util.*;
-import sun.misc.*;
+import java.util.function.Consumer;
 
 
 /**
@@ -62,9 +61,47 @@
         channelArray = new SelectionKeyImpl[INIT_CAP];
     }
 
-    protected int doSelect(long timeout)
-        throws IOException
-    {
+    @Override
+    protected int doSelect(long timeout) throws IOException {
+        pollWrapper(timeout);
+        int numKeysUpdated = updateSelectedKeys();
+        clearWakeupPipeIfInterrupted();
+        return numKeysUpdated;
+    }
+
+    @Override
+    protected int doSelect(Consumer<SelectionKey> handler, long timeout) throws IOException {
+        pollWrapper(timeout);
+        int numKeysUpdated = 0;
+        // Skip zeroth entry; it is for interrupts only
+        for (int i=channelOffset; i<totalChannels; i++) {
+            int rOps = pollWrapper.getReventOps(i);
+            if (rOps != 0) {
+                SelectionKeyImpl ski = channelArray[i];
+                pollWrapper.putReventOps(i, 0);
+                ski.channel.translateAndSetReadyOps(rOps, ski);
+                if (ski.hasOps()) {
+                    handler.accept(ski);
+                    numKeysUpdated++;
+                }
+            }
+        }
+        clearWakeupPipeIfInterrupted();
+        return numKeysUpdated;
+    }
+
+    private void clearWakeupPipeIfInterrupted() throws IOException {
+        if (pollWrapper.getReventOps(0) != 0) {
+            // Clear the wakeup pipe
+            pollWrapper.putReventOps(0, 0);
+            synchronized (interruptLock) {
+                IOUtil.drain(fd0);
+                interruptTriggered = false;
+            }
+        }
+    }
+
+    private void pollWrapper(long timeout) throws ClosedSelectorException, IOException {
         if (channelArray == null)
             throw new ClosedSelectorException();
         processDeregisterQueue();
@@ -75,18 +112,9 @@
             end();
         }
         processDeregisterQueue();
-        int numKeysUpdated = updateSelectedKeys();
-        if (pollWrapper.getReventOps(0) != 0) {
-            // Clear the wakeup pipe
-            pollWrapper.putReventOps(0, 0);
-            synchronized (interruptLock) {
-                IOUtil.drain(fd0);
-                interruptTriggered = false;
-            }
-        }
-        return numKeysUpdated;
     }
 
+    @Override
     protected void implCloseInterrupt() throws IOException {
         // prevent further wakeup
         synchronized (interruptLock) {