[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: Only reuse valid selection keys

[Kaffe CVS]

PatchSet 5513 
Date: 2004/12/03 00:44:27
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: Only reuse valid selection keys

2004-12-02  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:
        Resynced with GNU Classpath.

        2004-11-23  Michael Koch  <konqueror at gmx.de>

        * java/nio/channels/spi/AbstractSelectableChannel.java
        (register): Only reuse valid selection keys.

Members: 
	ChangeLog:1.3059->1.3060 
	libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:1.10->1.11 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3059 kaffe/ChangeLog:1.3060
--- kaffe/ChangeLog:1.3059	Fri Dec  3 00:04:29 2004
+++ kaffe/ChangeLog	Fri Dec  3 00:44:27 2004
@@ -1,5 +1,15 @@
 2004-12-02  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:
+        Resynced with GNU Classpath.
+
+	2004-11-23  Michael Koch  <konqueror at gmx.de>
+
+        * java/nio/channels/spi/AbstractSelectableChannel.java
+        (register): Only reuse valid selection keys.
+
+2004-12-02  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/nio/NIOServerSocket.java:
         Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java
diff -u kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:1.10 kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:1.11
--- kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:1.10	Mon May 17 15:01:03 2004
+++ kaffe/libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java	Fri Dec  3 00:44:29 2004
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.nio.channels.spi;
 
 import java.io.IOException;
@@ -45,7 +46,6 @@
 import java.util.LinkedList;
 import java.util.ListIterator;
 
-
 public abstract class AbstractSelectableChannel extends SelectableChannel
 {
   private boolean blocking = true;
@@ -226,7 +226,7 @@
       {
 	key = locate(selector);
 
-	if (key != null)
+	if (key != null && key.isValid())
 	  {
 	    if (att != null)
 	      key.attach(att);