Commit eac559b6 by Jeff Sturm Committed by Jeff Sturm

Fix build failure.

* gnu/java/nio/SelectorImpl.java (getFDsAsArray): Use getNativeFD().
(select): Likewise.
(register): Use DatagramChannelSelectionKey, SocketChannelSelectionKey.

From-SVN: r71812
parent 188fc5b5
2003-09-25 Jeff Sturm <jsturm@one-point.com>
* gnu/java/nio/SelectorImpl.java (getFDsAsArray): Use getNativeFD().
(select): Likewise.
(register): Use DatagramChannelSelectionKey, SocketChannelSelectionKey.
2003-09-25 Michael Koch <konqueror@gmx.de> 2003-09-25 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/DatagramChannelImpl.java * gnu/java/nio/DatagramChannelImpl.java
......
...@@ -125,7 +125,7 @@ public class SelectorImpl extends AbstractSelector ...@@ -125,7 +125,7 @@ public class SelectorImpl extends AbstractSelector
if ((key.interestOps () & ops) != 0) if ((key.interestOps () & ops) != 0)
{ {
result[counter] = key.fd; result[counter] = key.getNativeFD();
counter++; counter++;
} }
} }
...@@ -172,7 +172,7 @@ public class SelectorImpl extends AbstractSelector ...@@ -172,7 +172,7 @@ public class SelectorImpl extends AbstractSelector
// Set new ready read/accept ops // Set new ready read/accept ops
for (int i = 0; i < read.length; i++) for (int i = 0; i < read.length; i++)
{ {
if (key.fd == read[i]) if (key.getNativeFD() == read[i])
{ {
if (key.channel () instanceof ServerSocketChannelImpl) if (key.channel () instanceof ServerSocketChannelImpl)
{ {
...@@ -188,7 +188,7 @@ public class SelectorImpl extends AbstractSelector ...@@ -188,7 +188,7 @@ public class SelectorImpl extends AbstractSelector
// Set new ready write ops // Set new ready write ops
for (int i = 0; i < write.length; i++) for (int i = 0; i < write.length; i++)
{ {
if (key.fd == write[i]) if (key.getNativeFD() == write[i])
{ {
ops = ops | SelectionKey.OP_WRITE; ops = ops | SelectionKey.OP_WRITE;
...@@ -253,17 +253,17 @@ public class SelectorImpl extends AbstractSelector ...@@ -253,17 +253,17 @@ public class SelectorImpl extends AbstractSelector
if (ch instanceof SocketChannelImpl) if (ch instanceof SocketChannelImpl)
{ {
SocketChannelImpl sc = (SocketChannelImpl) ch; SocketChannelImpl sc = (SocketChannelImpl) ch;
result = new SelectionKeyImpl (ch, this, 0); // FIXME: last argument result = new SocketChannelSelectionKey (ch, this); // FIXME: last argument
} }
else if (ch instanceof DatagramChannelImpl) else if (ch instanceof DatagramChannelImpl)
{ {
DatagramChannelImpl dc = (DatagramChannelImpl) ch; DatagramChannelImpl dc = (DatagramChannelImpl) ch;
result = new SelectionKeyImpl (ch, this, 0); // FIXME: last argument result = new DatagramChannelSelectionKey (ch, this); // FIXME: last argument
} }
else if (ch instanceof ServerSocketChannelImpl) else if (ch instanceof ServerSocketChannelImpl)
{ {
ServerSocketChannelImpl ssc = (ServerSocketChannelImpl) ch; ServerSocketChannelImpl ssc = (ServerSocketChannelImpl) ch;
result = new SelectionKeyImpl (ch, this, 0); // FIXME: last argument result = new SocketChannelSelectionKey (ch, this); // FIXME: last argument
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment