From d9b526cc1d071648d66917b021aac9c459f9082c Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 2 Dec 2003 15:11:57 +0000 Subject: [PATCH] 2003-12-02 Michael Koch * java/nio/channels/spi/AbstractInterruptibleChannel.java (opened): Removed. (closed): New field. (close): Check of channel is closed already. (isOpen): Return !closed. From-SVN: r74182 --- libjava/ChangeLog | 8 ++++++++ .../channels/spi/AbstractInterruptibleChannel.java | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 690a4f7b046..409bf3b8745 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2003-12-02 Michael Koch + + * java/nio/channels/spi/AbstractInterruptibleChannel.java + (opened): Removed. + (closed): New field. + (close): Check of channel is closed already. + (isOpen): Return !closed. + 2003-12-02 Michael Koch * gnu/java/nio/DatagramChannelImpl.java diff --git a/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java b/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java index dd4177a8a01..0cf798eaf57 100644 --- a/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java +++ b/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java @@ -49,7 +49,7 @@ import java.nio.channels.InterruptibleChannel; public abstract class AbstractInterruptibleChannel implements Channel, InterruptibleChannel { - boolean opened = true; + private boolean closed; /** * Initializes the channel. @@ -72,8 +72,11 @@ public abstract class AbstractInterruptibleChannel */ public final void close () throws IOException { - opened = false; - implCloseChannel (); + if (!closed) + { + implCloseChannel(); + closed = true; + } } /** @@ -101,6 +104,6 @@ public abstract class AbstractInterruptibleChannel */ public final boolean isOpen () { - return opened; + return !closed; } } -- 2.30.2