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

[Kaffe CVS]

PatchSet 4303 
Date: 2004/01/09 18:05:23
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

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

        Resynced with GNU Classpath.

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

        * java/nio/channels/spi/AbstractSelectableChannel.java
        (configureBlocking): Use blockingLock() instead of LOCK.
        Set blocking after successfully called implConfigureBlocking().
        (register): Use blockingLock() instead of LOCK.

Members: 
	ChangeLog:1.1890->1.1891 
	libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1890 kaffe/ChangeLog:1.1891
--- kaffe/ChangeLog:1.1890	Fri Jan  9 17:56:34 2004
+++ kaffe/ChangeLog	Fri Jan  9 18:05:23 2004
@@ -1,5 +1,16 @@
 2004-01-09  Dalibor Topic <robilad@kaffe.org>
 
+        Resynced with GNU Classpath.
+
+	2004-01-08  Michael Koch  <konqueror@gmx.de>
+
+        * java/nio/channels/spi/AbstractSelectableChannel.java
+        (configureBlocking): Use blockingLock() instead of LOCK.
+        Set blocking after successfully called implConfigureBlocking().
+        (register): Use blockingLock() instead of LOCK.
+
+2004-01-09  Dalibor Topic <robilad@kaffe.org>
+
 	Resynced with GNU Classpath.
 
 	2004-01-06  Michael Koch  <konqueror@gmx.de>
Index: kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java
diff -u kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:1.4 kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:1.5
--- kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:1.4	Sat Dec 27 21:15:59 2003
+++ kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java	Fri Jan  9 18:05:25 2004
@@ -75,13 +75,13 @@
   /**
    * Adjusts this channel's blocking mode.
    */
-  public final SelectableChannel configureBlocking (boolean block)
+  public final SelectableChannel configureBlocking (boolean blocking)
     throws IOException
   {
-    synchronized (LOCK)
+    synchronized (blockingLock())
       {
-        blocking = block;
-        implConfigureBlocking (block);
+        implConfigureBlocking(blocking);
+        this.blocking = blocking;
       }
     
     return this;
@@ -187,7 +187,7 @@
     SelectionKey key = null;
     AbstractSelector selector = (AbstractSelector) selin;
 
-    synchronized (LOCK)
+    synchronized (blockingLock())
       {
         key = locate (selector);