diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-09-26 21:37:54 +0000 |
|---|---|---|
| committer | Michael Koch <konqueror@gmx.de> | 2003-09-26 21:37:54 +0000 |
| commit | 75ff281f4814476869c21f96f5b6d33dfeca23f6 (patch) | |
| tree | 794f77c2221c6ed541b3aec8f87319ccad698775 /gnu/java/nio/SelectorImpl.java | |
| parent | 80674d559b4eb294150641aa0d3b21767da55a0a (diff) | |
| download | classpath-75ff281f4814476869c21f96f5b6d33dfeca23f6.tar.gz | |
2003-09-26 Michael Koch <konqueror@gmx.de>
* gnu/java/net/PlainDatagramSocketImpl.java,
gnu/java/net/PlainSocketImpl.java:
(getNativeFD): New method.
* gnu/java/nio/DatagramChannelImpl.java,
gnu/java/nio/DatagramChannelSelectionKey.java,
gnu/java/nio/SelectionKeyImpl.java,
gnu/java/nio/SelectorImpl.java,
gnu/java/nio/SocketChannelImpl.java:
Many fixes, I cant write them all down here again.
Files are merged from libgcj.
* gnu/java/nio/DatagramChannelSelectionKey.java,
gnu/java/nio/SocketChannelSelectionKey.java:
New files.
* gnu/java/nio/Makefile.am (EXTRA_DIST):
Added DatagramChannelSeclectionKey.java and
SocketChannelSelectionKey.java.
Diffstat (limited to 'gnu/java/nio/SelectorImpl.java')
| -rw-r--r-- | gnu/java/nio/SelectorImpl.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/java/nio/SelectorImpl.java b/gnu/java/nio/SelectorImpl.java index ea2ceda71..08531ef44 100644 --- a/gnu/java/nio/SelectorImpl.java +++ b/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 { |