--- a/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java Mon Jan 20 09:20:13 2014 +0100
+++ b/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java Mon Jan 20 09:24:25 2014 +0100
@@ -884,15 +884,14 @@
int oldOps = sk.nioReadyOps();
int newOps = initialOps;
- if ((ops & PollArrayWrapper.POLLNVAL) != 0) {
+ if ((ops & Net.POLLNVAL) != 0) {
// This should only happen if this channel is pre-closed while a
// selection operation is in progress
// ## Throw an error if this channel has not been pre-closed
return false;
}
- if ((ops & (PollArrayWrapper.POLLERR
- | PollArrayWrapper.POLLHUP)) != 0) {
+ if ((ops & (Net.POLLERR | Net.POLLHUP)) != 0) {
newOps = intOps;
sk.nioReadyOps(newOps);
// No need to poll again in checkConnect,
@@ -901,19 +900,19 @@
return (newOps & ~oldOps) != 0;
}
- if (((ops & PollArrayWrapper.POLLIN) != 0) &&
+ if (((ops & Net.POLLIN) != 0) &&
((intOps & SelectionKey.OP_READ) != 0) &&
(state == ST_CONNECTED))
newOps |= SelectionKey.OP_READ;
- if (((ops & PollArrayWrapper.POLLCONN) != 0) &&
+ if (((ops & Net.POLLCONN) != 0) &&
((intOps & SelectionKey.OP_CONNECT) != 0) &&
((state == ST_UNCONNECTED) || (state == ST_PENDING))) {
newOps |= SelectionKey.OP_CONNECT;
readyToConnect = true;
}
- if (((ops & PollArrayWrapper.POLLOUT) != 0) &&
+ if (((ops & Net.POLLOUT) != 0) &&
((intOps & SelectionKey.OP_WRITE) != 0) &&
(state == ST_CONNECTED))
newOps |= SelectionKey.OP_WRITE;
@@ -958,11 +957,11 @@
public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) {
int newOps = 0;
if ((ops & SelectionKey.OP_READ) != 0)
- newOps |= PollArrayWrapper.POLLIN;
+ newOps |= Net.POLLIN;
if ((ops & SelectionKey.OP_WRITE) != 0)
- newOps |= PollArrayWrapper.POLLOUT;
+ newOps |= Net.POLLOUT;
if ((ops & SelectionKey.OP_CONNECT) != 0)
- newOps |= PollArrayWrapper.POLLCONN;
+ newOps |= Net.POLLCONN;
sk.selector.putEventOps(sk, newOps);
}