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

[Kaffe CVS]

PatchSet 4296 
Date: 2004/01/08 17:25:25
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/SocketChannelImpl.java
        (blocking): Removed.
        (connectionPending): Don't re-initialize with default value.
        (SocketChannelImpl): Call configureBlocking().
        (implConfigureBlocking): Dont initialize blocking.
        (connect): Use isBlocking().

Members: 
	ChangeLog:1.1883->1.1884 
	libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1883 kaffe/ChangeLog:1.1884
--- kaffe/ChangeLog:1.1883	Thu Jan  8 17:17:32 2004
+++ kaffe/ChangeLog	Thu Jan  8 17:25:25 2004
@@ -4,6 +4,19 @@
 
 	2004-01-08  Michael Koch  <konqueror@gmx.de>
 
+        * gnu/java/nio/SocketChannelImpl.java
+        (blocking): Removed.
+        (connectionPending): Don't re-initialize with default value.
+        (SocketChannelImpl): Call configureBlocking().
+        (implConfigureBlocking): Dont initialize blocking.
+        (connect): Use isBlocking().
+
+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.
Index: kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.9 kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.10
--- kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.9	Wed Dec  3 20:09:34 2003
+++ kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java	Thu Jan  8 17:25:26 2004
@@ -65,8 +65,7 @@
 {
   private PlainSocketImpl impl;
   private NIOSocket socket;
-  private boolean blocking = true;
-  private boolean connectionPending = false;
+  private boolean connectionPending;
 
   SocketChannelImpl (SelectorProvider provider)
     throws IOException
@@ -74,6 +73,7 @@
     super (provider);
     impl = new PlainSocketImpl();
     socket = new NIOSocket (impl, this);
+    configureBlocking(true);
   }
   
   SocketChannelImpl (SelectorProvider provider,
@@ -117,7 +117,6 @@
   protected void implConfigureBlocking (boolean blocking) throws IOException
   {
     socket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
-    this.blocking = blocking;
   }   
 
   public boolean connect (SocketAddress remote) throws IOException
@@ -137,7 +136,7 @@
     if (((InetSocketAddress) remote).isUnresolved())
       throw new UnresolvedAddressException();
     
-    if (blocking)
+    if (isBlocking())
       {
         // Do blocking connect.
         socket.connect (remote);
@@ -301,8 +300,6 @@
         data = src.array();
       }
 
-    System.out.println ("INTERNAL: writing to socket outputstream");
-    
     OutputStream output = socket.getOutputStream();
     output.write (data, offset, len);