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

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

From-SVN: r80922

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e0aceb1af65a1a97f4d0671aac097865e58af1f0..6bae932337002f240de0669a6ac2d8e1bfe331e7 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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:

diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java
index 037421d682a56fb3c4d19c326ba5a2e328ab741c..e2f0314162f7dcd1f9e7ef424c9ebd1595a0c872 100644 (file)
--- 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() + "]");
   }
 
   /**