Commit f5874634 by Michael Koch Committed by Michael Koch

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

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

From-SVN: r80922
parent c56122d8
2004-04-20 Michael Koch <konqueror@gmx.de> 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: * java/io/BufferedWriter.java:
Reordered variables to be at top of the class. Reordered variables to be at top of the class.
(localFlush): Removed redundant final keyword. (localFlush): Removed redundant final keyword.
......
...@@ -91,7 +91,7 @@ public class ServerSocket ...@@ -91,7 +91,7 @@ public class ServerSocket
throw new NullPointerException("impl may not be null"); throw new NullPointerException("impl may not be null");
this.impl = impl; this.impl = impl;
this.impl.create (true); this.impl.create(true);
} }
/* /*
...@@ -370,10 +370,9 @@ public class ServerSocket ...@@ -370,10 +370,9 @@ public class ServerSocket
// it is in non-blocking mode, we throw an IllegalBlockingModeException. // it is in non-blocking mode, we throw an IllegalBlockingModeException.
// However, in our implementation if the channel itself initiated this // However, in our implementation if the channel itself initiated this
// operation, then we must honor it regardless of its blocking mode. // operation, then we must honor it regardless of its blocking mode.
if (getChannel() != null if (getChannel() != null && ! getChannel().isBlocking()
&& !getChannel().isBlocking () && ! ((PlainSocketImpl) getImpl()).isInChannelOperation())
&& !((PlainSocketImpl) getImpl()).isInChannelOperation()) throw new IllegalBlockingModeException();
throw new IllegalBlockingModeException ();
impl.accept(socket.getImpl()); impl.accept(socket.getImpl());
} }
...@@ -580,10 +579,8 @@ public class ServerSocket ...@@ -580,10 +579,8 @@ public class ServerSocket
if (! isBound()) if (! isBound())
return "ServerSocket[unbound]"; return "ServerSocket[unbound]";
return ("ServerSocket[addr=" + getInetAddress() return ("ServerSocket[addr=" + getInetAddress() + ",port="
+ ",port=" + impl.getPort() + impl.getPort() + ",localport=" + impl.getLocalPort() + "]");
+ ",localport=" + impl.getLocalPort()
+ "]");
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment