From c44cc446f7d34edab0c3080928e3735575665602 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 2 Apr 2007 22:10:41 +0000 Subject: 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 --- libjava/gnu/java/net/PlainSocketImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libjava/gnu/java/net/PlainSocketImpl.java') 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 _) { -- cgit v1.1