Merged gcj-eclipse branch to trunk.

From-SVN: r120621
This commit is contained in:
Tom Tromey
2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions
+16 -13
View File
@@ -48,30 +48,33 @@ import java.nio.channels.SocketChannel;
*/
public final class NIOSocket extends Socket
{
private PlainSocketImpl impl;
private SocketChannelImpl channel;
protected NIOSocket (PlainSocketImpl impl, SocketChannelImpl channel)
protected NIOSocket (SocketChannelImpl channel)
throws IOException
{
super (impl);
this.impl = impl;
super (new NIOSocketImpl(channel));
this.channel = channel;
}
public final PlainSocketImpl getPlainSocketImpl()
{
return impl;
}
//public final PlainSocketImpl getPlainSocketImpl()
//{
// return impl;
//}
final void setChannel (SocketChannelImpl channel)
{
this.impl = channel.getPlainSocketImpl();
this.channel = channel;
}
//final void setChannel (SocketChannelImpl channel)
//{
// this.impl = channel.getPlainSocketImpl();
// this.channel = channel;
//}
public final SocketChannel getChannel()
{
return channel;
}
public boolean isConnected()
{
return channel.isConnected();
}
}