2004-03-18 Michael Koch <konqueror@gmx.de>

[gcc.git] / libjava / java / nio / channels / spi / AbstractSelectableChannel.java

diff --git a/libjava/java/nio/channels/spi/AbstractSelectableChannel.java b/libjava/java/nio/channels/spi/AbstractSelectableChannel.java
index b13bb4af24fe0f1c0918fd9d04f8776f0ba374be..a07485df85f1f61bf346b2469af0a50c83bf9e51 100644 (file)
--- a/libjava/java/nio/channels/spi/AbstractSelectableChannel.java
+++ b/libjava/java/nio/channels/spi/AbstractSelectableChannel.java
@@ -1,5 +1,5 @@
 /* AbstractSelectableChannel.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,11 +48,10 @@ import java.util.ListIterator;
 
 public abstract class AbstractSelectableChannel extends SelectableChannel
 {
-  int registered;
-  boolean blocking = true;
-  Object LOCK = new Object ();
-  SelectorProvider provider;
-  List keys;
+  private boolean blocking = true;
+  private Object LOCK = new Object();
+  private SelectorProvider provider;
+  private LinkedList keys = new LinkedList();
 
   /**
    * Initializes the channel
@@ -74,13 +73,16 @@ public abstract class AbstractSelectableChannel extends SelectableChannel
   /**
    * 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 = true;
-        implConfigureBlocking (block);
+        if (this.blocking != blocking)
+          {
+            implConfigureBlocking(blocking);
+            this.blocking = blocking;
+          }
       }
     
     return this;
@@ -122,7 +124,7 @@ public abstract class AbstractSelectableChannel extends SelectableChannel
    */
   public final boolean isRegistered()
   {
-    return registered > 0;
+    return !keys.isEmpty();
   }
 
   /**
@@ -131,9 +133,15 @@ public abstract class AbstractSelectableChannel extends SelectableChannel
    */
   public final SelectionKey keyFor(Selector selector)
   {
+    if (! isOpen())
+      return null;
+    
     try
       {
-        return register (selector, 0, null);
+        synchronized(blockingLock())
+         {
+           return locate (selector);
+         }
       }
     catch (Exception e)
       {
@@ -151,32 +159,17 @@ public abstract class AbstractSelectableChannel extends SelectableChannel
 
   private SelectionKey locate (Selector selector)
   {
-    if (keys == null)
-      return null;
-    
-    SelectionKey k = null;
     ListIterator it = keys.listIterator ();
     
     while (it.hasNext ())
       {
-       k = (SelectionKey) it.next ();
-       if (k.selector () == selector)
-          {
-            return k;
-          }
-      }
-    
-    return k;
-  }
-
-  private void add (SelectionKey key)
-  {
-    if (keys == null)
-      {
-        keys = new LinkedList ();
+        SelectionKey key = (SelectionKey) it.next();
+        
+       if (key.selector() == selector)
+          return key;
       }
     
-    keys.add (key);
+    return null;
   }
 
   /**
@@ -190,26 +183,38 @@ public abstract class AbstractSelectableChannel extends SelectableChannel
     if (!isOpen ())
       throw new ClosedChannelException();
 
-    SelectionKey k = null;
+    SelectionKey key = null;
     AbstractSelector selector = (AbstractSelector) selin;
 
-    synchronized (LOCK)
+    synchronized (blockingLock())
       {
-        k = locate (selector);
+        key = locate (selector);
 
-        if (k != null)
+        if (key != null)
           {
-            k.attach (att);
+           if (att != null)
+             key.attach (att);
           }
         else
           {
-            k = selector.register (this, ops, att);
+            key = selector.register (this, ops, att);
                
-            if (k != null)
-              add (k);
+            if (key != null)
+              addSelectionKey (key);
           }
       }
 
-    return k;
+    return key;
+  }
+
+  void addSelectionKey(SelectionKey key)
+  {
+    keys.add(key);
+  }
+
+  // This method gets called by AbstractSelector.deregister().
+  void removeSelectionKey(SelectionKey key)
+  {
+    keys.remove(key);
   }
 }