* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123440
138bc75d-0d04-0410-961f-
82ee72b054a4
+2007-04-02 Tom Tromey <tromey@redhat.com>
+
+ 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.
+
2007-04-02 Andrew Haley <aph@redhat.com>
* java/lang/reflect/natVMProxy.cc (run_proxy): Use
*
* @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.
{
localSocketAddress
= new InetSocketAddress ((InetAddress) getOption(SocketOptions.SO_BINDADDR),
- localport);
+ localport == -1 ? 0 : localport);
}
catch (SocketException _)
{
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)
/* 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.
{
super (provider);
impl = new PlainSocketImpl();
+ impl.create(true);
socket = new NIOSocket (impl, this);
configureBlocking(true);
}