2004-04-20 Michael Koch <konqueror@gmx.de>

* java/net/ServerSocket.java
	Merged coding style from GNU classpath.

From-SVN: r80922
This commit is contained in:
Michael Koch 2004-04-20 20:32:41 +00:00 committed by Michael Koch
parent c56122d841
commit f58746340d
2 changed files with 13 additions and 11 deletions

View file

@ -1,3 +1,8 @@
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/net/ServerSocket.java
Merged coding style from GNU classpath.
2004-04-20 Michael Koch <konqueror@gmx.de>
* java/io/BufferedWriter.java:

View file

@ -91,7 +91,7 @@ public class ServerSocket
throw new NullPointerException("impl may not be null");
this.impl = impl;
this.impl.create (true);
this.impl.create(true);
}
/*
@ -370,11 +370,10 @@ public class ServerSocket
// it is in non-blocking mode, we throw an IllegalBlockingModeException.
// However, in our implementation if the channel itself initiated this
// operation, then we must honor it regardless of its blocking mode.
if (getChannel() != null
&& !getChannel().isBlocking ()
&& !((PlainSocketImpl) getImpl()).isInChannelOperation())
throw new IllegalBlockingModeException ();
if (getChannel() != null && ! getChannel().isBlocking()
&& ! ((PlainSocketImpl) getImpl()).isInChannelOperation())
throw new IllegalBlockingModeException();
impl.accept(socket.getImpl());
}
@ -579,11 +578,9 @@ public class ServerSocket
{
if (! isBound())
return "ServerSocket[unbound]";
return ("ServerSocket[addr=" + getInetAddress()
+ ",port=" + impl.getPort()
+ ",localport=" + impl.getLocalPort()
+ "]");
return ("ServerSocket[addr=" + getInetAddress() + ",port="
+ impl.getPort() + ",localport=" + impl.getLocalPort() + "]");
}
/**