diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-05 15:57:01 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-05 15:57:01 +0000 |
| commit | 7483927e094c1affb69579309f3f557b49ecf1b8 (patch) | |
| tree | 72acb0540d702c93f018f90704f00958f0528c30 /libjava | |
| parent | 304562a919cfdadde0fef58f551bc65a72857925 (diff) | |
| download | gcc-7483927e094c1affb69579309f3f557b49ecf1b8.tar.gz | |
2004-02-05 Michael Koch <konqueror@gmx.de>
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77317 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/NIOServerSocket.java | 3 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/SocketChannelImpl.java | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 35e896f1e18..69b5a5265f4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2004-02-05 Michael Koch <konqueror@gmx.de> + + * 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. + 2004-02-02 Graydon Hoare <graydon@redhat.com> * javax/swing/SwingUtilities.java: Many new functions. diff --git a/libjava/gnu/java/nio/NIOServerSocket.java b/libjava/gnu/java/nio/NIOServerSocket.java index 89def3bb5ee..3164247765b 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 d490529f873..d4dd6e05653 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()) |