From 99814868c136ea369dbd4515ece0f7713d1998f4 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Thu, 5 Feb 2004 15:57:01 +0000 Subject: 2004-02-05 Michael Koch * gnu/java/nio/NIOServerSocket.java (impl): Unused, removed. * gnu/java/nio/SocketChannelImpl.java (finnishConnect): Don't throw NoConnectionPendingException if not connected or no connection pending. From-SVN: r77317 --- libjava/gnu/java/nio/NIOServerSocket.java | 3 +-- libjava/gnu/java/nio/SocketChannelImpl.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'libjava/gnu/java') diff --git a/libjava/gnu/java/nio/NIOServerSocket.java b/libjava/gnu/java/nio/NIOServerSocket.java index 89def3b..3164247 100644 --- a/libjava/gnu/java/nio/NIOServerSocket.java +++ b/libjava/gnu/java/nio/NIOServerSocket.java @@ -1,5 +1,5 @@ /* NIOServerSocket.java -- - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,6 @@ import java.nio.channels.SocketChannel; */ public final class NIOServerSocket extends ServerSocket { - private PlainSocketImpl impl; private ServerSocketChannelImpl channel; protected NIOServerSocket (ServerSocketChannelImpl channel) diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index d490529..d4dd6e0 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -174,7 +174,7 @@ public final class SocketChannelImpl extends SocketChannel if (!isOpen()) throw new ClosedChannelException(); - if (!connectionPending) + if (!isConnected() && !connectionPending) throw new NoConnectionPendingException(); if (isConnected()) -- cgit v1.1