mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2025-01-25 22:04:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build failure.

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

From-SVN: r71812
This commit is contained in:
Jeff Sturm 2003-09-26 03:50:45 +00:00 committed by Jeff Sturm
parent 188fc5b50d
commit eac559b624
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -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

12
libjava/gnu/java/nio/SelectorImpl.java
View File

@ -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
{