diff options
| author | Tom Tromey <tromey@redhat.com> | 2007-04-02 22:10:41 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-04-02 22:10:41 +0000 |
| commit | c44cc446f7d34edab0c3080928e3735575665602 (patch) | |
| tree | 7ad846a0163eaba98c9fe1213f2b4a3a8a18a96c /libjava/gnu | |
| parent | c8bbabf282817c068f44b944a467ac71e67259e0 (diff) | |
| download | gcc-c44cc446f7d34edab0c3080928e3735575665602.zip gcc-c44cc446f7d34edab0c3080928e3735575665602.tar.gz gcc-c44cc446f7d34edab0c3080928e3735575665602.tar.bz2 | |
natPlainSocketImplPosix.cc (create): Return if already created.
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=233406
* gnu/java/net/natPlainSocketImplPosix.cc (create): Return if
already created.
* gnu/java/net/PlainSocketImpl.java (getLocalAddress): Handle case
where localport is -1.
(create): Now public.
* gnu/java/nio/SocketChannelImpl.java (SocketChannelImpl): Call
'create' on the socket.
From-SVN: r123440
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/java/net/PlainSocketImpl.java | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplPosix.cc | 4 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/SocketChannelImpl.java | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libjava/gnu/java/net/PlainSocketImpl.java b/libjava/gnu/java/net/PlainSocketImpl.java index dad1724..d2c8f02 100644 --- a/libjava/gnu/java/net/PlainSocketImpl.java +++ b/libjava/gnu/java/net/PlainSocketImpl.java @@ -228,7 +228,9 @@ public final class PlainSocketImpl extends SocketImpl * * @param stream true for a stream socket, false for a datagram socket */ - protected native void create(boolean stream) throws IOException; + // FIXME: this is public for nio ... but this is just a hack + // until we upgrade to Classpath's nio. + public native void create(boolean stream) throws IOException; /** * Connects to the remote hostname and port specified as arguments. @@ -336,7 +338,7 @@ public final class PlainSocketImpl extends SocketImpl { localSocketAddress = new InetSocketAddress ((InetAddress) getOption(SocketOptions.SO_BINDADDR), - localport); + localport == -1 ? 0 : localport); } catch (SocketException _) { diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc index d16f1d3..b4f4a85 100644 --- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc @@ -64,6 +64,10 @@ union SockAddr void gnu::java::net::PlainSocketImpl::create (jboolean stream) { + // We might already have been create()d in the nio case. + if (native_fd != -1) + return; + int sock = _Jv_socket (AF_INET, stream ? SOCK_STREAM : SOCK_DGRAM, 0); if (sock < 0) diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index cda86e8..5925712 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -1,5 +1,5 @@ /* SocketChannelImpl.java -- - Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,6 +71,7 @@ public final class SocketChannelImpl extends SocketChannel { super (provider); impl = new PlainSocketImpl(); + impl.create(true); socket = new NIOSocket (impl, this); configureBlocking(true); } |