diff options
| author | Jeff Sturm <jsturm@one-point.com> | 2003-09-26 03:50:45 +0000 |
|---|---|---|
| committer | Jeff Sturm <jsturm@gcc.gnu.org> | 2003-09-26 03:50:45 +0000 |
| commit | eac559b6244ca34f10a3d2bd7981bd6268a89e90 (patch) | |
| tree | 59d8186bc992d2f26e423d449e4f1099cac658ba | |
| parent | 188fc5b50df0eac45c7a294b453facc4f25481eb (diff) | |
| download | gcc-eac559b6244ca34f10a3d2bd7981bd6268a89e90.zip gcc-eac559b6244ca34f10a3d2bd7981bd6268a89e90.tar.gz gcc-eac559b6244ca34f10a3d2bd7981bd6268a89e90.tar.bz2 | |
Fix build failure.
* gnu/java/nio/SelectorImpl.java (getFDsAsArray): Use getNativeFD().
(select): Likewise.
(register): Use DatagramChannelSelectionKey, SocketChannelSelectionKey.
From-SVN: r71812
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/SelectorImpl.java | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 70cc0c5..98ac223 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +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> * gnu/java/nio/DatagramChannelImpl.java diff --git a/libjava/gnu/java/nio/SelectorImpl.java b/libjava/gnu/java/nio/SelectorImpl.java index ea2ceda..08531ef 100644 --- a/libjava/gnu/java/nio/SelectorImpl.java +++ b/libjava/gnu/java/nio/SelectorImpl.java @@ -125,7 +125,7 @@ public class SelectorImpl extends AbstractSelector if ((key.interestOps () & ops) != 0) { - result[counter] = key.fd; + result[counter] = key.getNativeFD(); counter++; } } @@ -172,7 +172,7 @@ public class SelectorImpl extends AbstractSelector // Set new ready read/accept ops for (int i = 0; i < read.length; i++) { - if (key.fd == read[i]) + if (key.getNativeFD() == read[i]) { if (key.channel () instanceof ServerSocketChannelImpl) { @@ -188,7 +188,7 @@ public class SelectorImpl extends AbstractSelector // Set new ready write ops for (int i = 0; i < write.length; i++) { - if (key.fd == write[i]) + if (key.getNativeFD() == write[i]) { ops = ops | SelectionKey.OP_WRITE; @@ -253,17 +253,17 @@ public class SelectorImpl extends AbstractSelector if (ch instanceof SocketChannelImpl) { 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) { 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) { ServerSocketChannelImpl ssc = (ServerSocketChannelImpl) ch; - result = new SelectionKeyImpl (ch, this, 0); // FIXME: last argument + result = new SocketChannelSelectionKey (ch, this); // FIXME: last argument } else { |