diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/net/ServerSocket.java | 19 |
2 files changed, 13 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e0aceb1..6bae932 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 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: Reordered variables to be at top of the class. (localFlush): Removed redundant final keyword. diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java index 037421d..e2f0314 100644 --- a/libjava/java/net/ServerSocket.java +++ b/libjava/java/net/ServerSocket.java @@ -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() + "]"); } /** |