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

[Kaffe CVS]

PatchSet 4193 
Date: 2003/12/04 01:53:23
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
resynced with GNU Classpath

2003-12-04  Dalibor Topic <robilad at kaffe.org>

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

        2003-12-02  Michael Koch  <konqueror at gmx.de>

        * java/nio/channels/spi/AbstractInterruptibleChannel.java
        (opened): Removed.
        (closed): New field.
        (close): Check of channel is closed already.

Members: 
	ChangeLog:1.1784->1.1785 
	libraries/javalib/java/nio/channels/spi/AbstractInterruptibleChannel.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1784 kaffe/ChangeLog:1.1785
--- kaffe/ChangeLog:1.1784	Thu Dec  4 01:30:31 2003
+++ kaffe/ChangeLog	Thu Dec  4 01:53:23 2003
@@ -1,5 +1,18 @@
 2003-12-04  Dalibor Topic <robilad at kaffe.org>
 
+	* libraries/javalib/java/nio/channels/spi/AbstractInterruptibleChannel.java:
+	Resynced with GNU Classpath.
+
+	2003-12-02  Michael Koch  <konqueror at gmx.de>
+
+        * java/nio/channels/spi/AbstractInterruptibleChannel.java
+        (opened): Removed.
+        (closed): New field.
+        (close): Check of channel is closed already.
+        (isOpen): Return !closed.
+
+2003-12-04  Dalibor Topic <robilad at kaffe.org>
+
 	* libraries/javalib/java/net/Inet4Address.java,
 	libraries/javalib/java/net/Inet6Address.java,
 	libraries/javalib/java/rmi/MarshalledObject.java,
Index: kaffe/libraries/javalib/java/nio/channels/spi/AbstractInterruptibleChannel.java
diff -u kaffe/libraries/javalib/java/nio/channels/spi/AbstractInterruptibleChannel.java:1.2 kaffe/libraries/javalib/java/nio/channels/spi/AbstractInterruptibleChannel.java:1.3
--- kaffe/libraries/javalib/java/nio/channels/spi/AbstractInterruptibleChannel.java:1.2	Sat Dec 21 16:40:40 2002
+++ kaffe/libraries/javalib/java/nio/channels/spi/AbstractInterruptibleChannel.java	Thu Dec  4 01:53:24 2003
@@ -49,7 +49,7 @@
 public abstract class AbstractInterruptibleChannel
   implements Channel, InterruptibleChannel
 {
-  boolean opened = true;
+  private boolean closed;
 
   /**
    * Initializes the channel.
@@ -72,8 +72,11 @@
    */
   public final void close () throws IOException
   {
-    opened = false;
-    implCloseChannel ();
+    if (!closed)
+      {
+	implCloseChannel();
+	closed = true;
+      }
   }
 
   /**
@@ -101,6 +104,6 @@
    */
   public final boolean isOpen ()
   {
-    return opened;
+    return !closed;
   }
 }