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

2003-09-18 Michael Koch <konqueror@gmx.de>

Browse source 
* java/net/DatagramSocket.java
	(ch): Removed.
	(receive): Use getChannel() instead of ch.
	(send): Likewise.
	(getChannel): Return null.
	* java/net/ServerSocket.java
	(ch): Removed.
	(setChannel): Removed.
	(implAccept): Use getChannel() instead of ch.
	(close): Likewise.
	(getChannel): Return null.
	* java/net/Socket.java
	(ch): Removed.
	(connect): Use getChannel() instead of ch.
	(setChannel): Removed.
	(getChannel): Return null.

From-SVN: r71516
This commit is contained in:
Michael Koch 2003-09-18 11:32:46 +00:00 • committed by Michael Koch
parent 780071b5a6
commit 9fd6479043
4 changed files with 34 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libjava/java/net/ServerSocket.java
View file

@ -73,12 +73,6 @@ public class ServerSocket
*/
private SocketImpl impl;
/**
* ServerSocketChannel of this ServerSocket. This channel only exists
* when the socket is created by ServerSocketChannel.open().
*/
private ServerSocketChannel ch;
private boolean closed = false;
/**
@ -160,14 +154,6 @@ public class ServerSocket
bind (new InetSocketAddress (bindAddr, port), backlog);
}
/*
* This method may only be used by java.nio.channels.ServerSocketChannel.open.
*/
void setChannel (ServerSocketChannel ch)
{
this.ch = ch;
}
/**
* Binds the server socket to a specified socket address
*
@ -318,7 +304,8 @@ public class ServerSocket
protected final void implAccept (Socket s)
throws IOException
{
if (ch != null && !ch.isBlocking())
if (getChannel() != null
&& !getChannel().isBlocking())
throw new IllegalBlockingModeException();
impl.accept(s.impl);
@ -334,8 +321,8 @@ public class ServerSocket
if (impl != null)
impl.close ();
if (ch != null)
ch.close ();
if (getChannel() != null)
getChannel().close ();
closed = true;
}
@ -351,7 +338,7 @@ public class ServerSocket
*/
public ServerSocketChannel getChannel()
{
return ch;
return null;
}
/**