[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4295 
Date: 2004/01/08 17:17:32
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-01-08  Dalibor Topic <robilad@kaffe.org>

        Resynced with GNU Classpath.

        2004-01-08  Michael Koch  <konqueror@gmx.de>

        * gnu/java/nio/ServerSocketChannelImpl.java
        (serverSocket): Made private.
        (connected): Made private, don't re-initialize with default value.
        (blocking): Removed.
        (ServerSocketChannelImpl): Call configureBlocking().
        (implConfigureBlocking): Don't initialize blocking.

Members: 
	ChangeLog:1.1882->1.1883 
	libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1882 kaffe/ChangeLog:1.1883
--- kaffe/ChangeLog:1.1882	Thu Jan  8 17:04:18 2004
+++ kaffe/ChangeLog	Thu Jan  8 17:17:32 2004
@@ -4,6 +4,19 @@
 
 	2004-01-08  Michael Koch  <konqueror@gmx.de>
 
+        * gnu/java/nio/ServerSocketChannelImpl.java
+        (serverSocket): Made private.
+        (connected): Made private, don't re-initialize with default value.
+        (blocking): Removed.
+        (ServerSocketChannelImpl): Call configureBlocking().
+        (implConfigureBlocking): Don't initialize blocking.
+
+2004-01-08  Dalibor Topic <robilad@kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2004-01-08  Michael Koch  <konqueror@gmx.de>
+
         * gnu/java/nio/PipeImpl.java
         (SourceChannelImpl): New inner class.
         (SinkChannelImpl): New inner class.
Index: kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.4 kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.5
--- kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.4	Wed Oct 22 10:34:47 2003
+++ kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java	Thu Jan  8 17:17:33 2004
@@ -54,15 +54,15 @@
 
 public final class ServerSocketChannelImpl extends ServerSocketChannel
 {
-  NIOServerSocket serverSocket;
-  boolean blocking = true;
-  boolean connected = false;
+  private NIOServerSocket serverSocket;
+  private boolean connected;
 
   protected ServerSocketChannelImpl (SelectorProvider provider)
     throws IOException
   {
     super (provider);
     serverSocket = new NIOServerSocket (this);
+    configureBlocking(true);
   }
 
   public int getNativeFD()
@@ -93,7 +93,6 @@
   protected void implConfigureBlocking (boolean blocking) throws IOException
   {
     serverSocket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
-    this.blocking = blocking;
   }
 
   public SocketChannel accept () throws IOException