diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b5b260bb3f5..cce4eb504de 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-14  Per Bothner  <per@bothner.com>
+
+	* java/nio/channels/spi/AbstractInterruptibleChannel.java (close):
+	Set closed before calling implCloseChannel, as in the spec.
+
 2004-02-09  Graydon Hoare  <graydon@redhat.com>
 
 	* javax/swing/ToggleButtonModel.java: Remove dead class.
diff --git a/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java b/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java
index 0cf798eaf57..5d9f886ac39 100644
--- a/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java
+++ b/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java
@@ -74,8 +74,8 @@ public abstract class AbstractInterruptibleChannel
   {
     if (!closed)
       {
-	implCloseChannel();
 	closed = true;
+	implCloseChannel();
       }
   }