From 06ca951d68a9144c793b1cef24b8f2bd4ed82947 Mon Sep 17 00:00:00 2001 From: green Date: Wed, 28 Dec 2005 18:29:10 +0000 Subject: [PATCH] 2005-12-28 Anthony Green * gnu/java/net/natPlainSocketImplPosix.cc (connect): Record address and port before attempting anything. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109116 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/gnu/java/net/natPlainSocketImplPosix.cc | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cff2e26..7eea0f8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-12-28 Anthony Green + + * gnu/java/net/natPlainSocketImplPosix.cc (connect): Record + address and port before attempting anything. + 2005-12-28 John David Anglin * sysdep/pa/locks.h (compare_and_swap): Add ldcw semaphore to make diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc index 643f4e4..be9437c 100644 --- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc @@ -142,6 +142,15 @@ gnu::java::net::PlainSocketImpl::connect (::java::net::SocketAddress *addr, ::java::net::InetAddress *host = tmp->getAddress(); jint rport = tmp->getPort(); + // Set the SocketImpl's address and port fields before we try to + // connect. Note that the fact that these are set doesn't imply + // that we're actually connected to anything. We need to record + // this data before we attempt the connect, since non-blocking + // SocketChannels will use this and almost certainly throw timeout + // exceptions. + address = host; + port = rport; + union SockAddr u; socklen_t addrlen = sizeof(u); jbyteArray haddress = host->addr; @@ -197,9 +206,6 @@ gnu::java::net::PlainSocketImpl::connect (::java::net::SocketAddress *addr, goto error; } - address = host; - port = rport; - // A bind may not have been done on this socket; if so, set localport now. if (localport == 0) { -- 2.7.4