--- a/jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Mon Jan 20 09:20:13 2014 +0100
+++ b/jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Mon Jan 20 09:24:25 2014 +0100
@@ -53,10 +53,6 @@
*/
class KQueueArrayWrapper {
- // Event masks
- static final short POLLIN = AbstractPollArrayWrapper.POLLIN;
- static final short POLLOUT = AbstractPollArrayWrapper.POLLOUT;
-
// kevent filters
static short EVFILT_READ;
static short EVFILT_WRITE;
@@ -129,9 +125,9 @@
// SinkChannelImpl, SourceChannelImpl, DatagramChannelImpl,
// ServerSocketChannelImpl, SocketChannelImpl
if (filter == EVFILT_READ) {
- result |= POLLIN;
+ result |= Net.POLLIN;
} else if (filter == EVFILT_WRITE) {
- result |= POLLOUT;
+ result |= Net.POLLOUT;
}
return result;
@@ -180,7 +176,7 @@
if (!ch.isOpen())
continue;
- register0(kq, ch.getFDVal(), u.events & POLLIN, u.events & POLLOUT);
+ register0(kq, ch.getFDVal(), u.events & Net.POLLIN, u.events & Net.POLLOUT);
}
}
}