2003-06-10 Michael Koch <konqueror@gmx.de>

	* gnu/java/nio/ServerSocketChannelImpl.java,
	gnu/java/nio/SocketChannelImpl.java:
	Mainly merged with libgcj.

1 files changed, 6 insertions, 9 deletions

diff --git a/gnu/java/nio/ServerSocketChannelImpl.java b/gnu/java/nio/ServerSocketChannelImpl.java
index 427b4b15b..3b5dc88af 100644
--- a/gnu/java/nio/ServerSocketChannelImpl.java
+++ b/gnu/java/nio/ServerSocketChannelImpl.java
@@ -54,9 +54,6 @@ class ServerSocketChannelImpl extends ServerSocketChannel
   boolean connected = false;
   InetSocketAddress sa;
 
-//   private static native int NioSocketAccept (ServerSocketChannelImpl server, 
-//                                              SocketChannelImpl s);
-
   private static int NioSocketAccept (ServerSocketChannelImpl server, 
                                       SocketChannelImpl s)
   {
@@ -82,15 +79,15 @@ class ServerSocketChannelImpl extends ServerSocketChannel
   public void finalizer()
   {
     if (connected)
-	    {
+      {
         try
           {
-            close();
+            close ();
           }
         catch (Exception e)
           {
           }
-	    }
+      }
   }
 
   protected void implCloseSelectableChannel () throws IOException
@@ -100,12 +97,12 @@ class ServerSocketChannelImpl extends ServerSocketChannel
     fd = SocketChannelImpl.SocketCreate ();
   }
 
-  protected void implConfigureBlocking (boolean block) throws IOException
+  protected void implConfigureBlocking (boolean blocking) throws IOException
   {
-    blocking = block;
+    this.blocking = blocking;
   }
 
-  public SocketChannel accept ()
+  public SocketChannel accept () throws IOException
   {
     SocketChannelImpl result = new SocketChannelImpl (provider ());
     result.sa = new InetSocketAddress (0);