Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 16 insertions, 7 deletions

diff --git a/libjava/classpath/java/nio/channels/spi/AbstractSelectableChannel.java b/libjava/classpath/java/nio/channels/spi/AbstractSelectableChannel.java
index 847c02cce06..5d5277b4a68 100644
--- a/libjava/classpath/java/nio/channels/spi/AbstractSelectableChannel.java
+++ b/libjava/classpath/java/nio/channels/spi/AbstractSelectableChannel.java
@@ -44,6 +44,7 @@ import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.IllegalBlockingModeException;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.ListIterator;
 
@@ -106,7 +107,15 @@ public abstract class AbstractSelectableChannel extends SelectableChannel
    */
   protected final void implCloseChannel() throws IOException
   {
-    implCloseSelectableChannel();
+    try
+      {
+        implCloseSelectableChannel();
+      }
+    finally
+      {
+        for (Iterator it = keys.iterator(); it.hasNext(); )
+          ((SelectionKey) it.next()).cancel();
+      }
   }
 
   /**
@@ -234,8 +243,8 @@ public abstract class AbstractSelectableChannel extends SelectableChannel
 
 	if (key != null && key.isValid())
 	  {
-	    if (att != null)
-	      key.attach(att);
+            key.interestOps(ops);
+            key.attach(att);
 	  }
 	else
 	  {
diff --git a/libjava/classpath/java/nio/channels/spi/AbstractSelector.java b/libjava/classpath/java/nio/channels/spi/AbstractSelector.java
index 78380738a2c..73f5077df92 100644
--- a/libjava/classpath/java/nio/channels/spi/AbstractSelector.java
+++ b/libjava/classpath/java/nio/channels/spi/AbstractSelector.java
@@ -1,5 +1,5 @@
 /* AbstractSelector.java --
-   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,7 +49,7 @@ public abstract class AbstractSelector extends Selector
 {
   private boolean closed;
   private SelectorProvider provider;
-  private HashSet cancelledKeys;
+  private HashSet<SelectionKey> cancelledKeys;
 
   /**
    * Initializes the slector.
@@ -59,7 +59,7 @@ public abstract class AbstractSelector extends Selector
   protected AbstractSelector(SelectorProvider provider)
   {
     this.provider = provider;
-    this.cancelledKeys = new HashSet();
+    this.cancelledKeys = new HashSet<SelectionKey>();
   }
 
   /**
@@ -115,7 +115,7 @@ public abstract class AbstractSelector extends Selector
    *
    * @return the cancelled keys set
    */
-  protected final Set cancelledKeys()
+  protected final Set<SelectionKey> cancelledKeys()
   {
     if (! isOpen())
       throw new ClosedSelectorException();