FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2003-06-14 Michael Koch <konqueror@gmx.de>

Browse source 
* gnu/java/nio/FileChannelImpl.java
        (map_address): Removed incorrect comment.
	* gnu/java/nio/SelectorImpl.java
        (register): Remove code duplication and code for file channel handling.
	* gnu/java/nio/ServerSocketChannelImpl.java
        (serverSocket): Renamed from sock_object.
        (ServerSocketChannel): Initialize serverSocket.
        (socket): Return serverSocket.
	* gnu/java/nio/SocketChannelImpl.java
        (socket): Renamed from sock_object.
        (isConnectionPenging): Simplified.
        (socket): Return socket.

From-SVN: r67940
This commit is contained in:
Michael Koch 2003-06-14 11:53:02 +00:00 • committed by Michael Koch
parent 34e8290f95
commit 81d2d258f5
5 changed files with 34 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

39
libjava/gnu/java/nio/SelectorImpl.java
View file

@ -250,50 +250,31 @@ public class SelectorImpl extends AbstractSelector
protected SelectionKey register (AbstractSelectableChannel ch, int ops,
Object att)
{
// // filechannel is not selectable ?
// if (ch instanceof FileChannelImpl)
// {
// FileChannelImpl fc = (FileChannelImpl) ch;
// SelectionKeyImpl impl = new SelectionKeyImpl (ch, this, fc.fd);
// keys.add (impl);
// impl.interestOps (ops);
// impl.attach (att);
// return impl;
// }
// else
SelectionKeyImpl result;
if (ch instanceof SocketChannelImpl)
{
SocketChannelImpl sc = (SocketChannelImpl) ch;
SelectionKeyImpl impl = new SelectionKeyImpl (ch, this, sc.fd);
add (impl);
impl.interestOps (ops);
impl.attach (att);
return impl;
result = new SelectionKeyImpl (ch, this, sc.fd);
}
else if (ch instanceof DatagramChannelImpl)
{
DatagramChannelImpl dc = (DatagramChannelImpl) ch;
SelectionKeyImpl impl = new SelectionKeyImpl (ch, this, dc.fd);
add (impl);
impl.interestOps (ops);
impl.attach (att);
return impl;
result = new SelectionKeyImpl (ch, this, dc.fd);
}
else if (ch instanceof ServerSocketChannelImpl)
{
ServerSocketChannelImpl ssc = (ServerSocketChannelImpl) ch;
SelectionKeyImpl impl = new SelectionKeyImpl (ch, this, ssc.fd);
add (impl);
impl.interestOps (ops);
impl.attach (att);
return impl;
result = new SelectionKeyImpl (ch, this, ssc.fd);
}
else
{
System.err.println ("INTERNAL ERROR, no known channel type");
throw new InternalError ("No known channel type");
}
return null;
add (result);
result.interestOps (ops);
result.attach (att);
return result;
}
}