From 4b294fdc6ec85b7584e517212171adbdbf77c93b Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 29 Jul 2003 15:50:20 +0000 Subject: 2003-07-29 Stephen Crawley * java/net/SocketImpl.java (toString): Display the remote address of an unconnected server socket as "0.0.0.0/0.0.0.0". * native/jni/java-net/javanet.c (_javanet_connect): Don't create a new InetAddress for the remote host. Instead, attach the parameter InetAddress to the connected SocketImpl object. * java/net/PlainSocketImpl.java (connect): Implemented connect(SocketAddress, int) overloading. --- native/jni/java-net/javanet.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'native/jni/java-net') diff --git a/native/jni/java-net/javanet.c b/native/jni/java-net/javanet.c index 1c39783ab..5381103d3 100644 --- a/native/jni/java-net/javanet.c +++ b/native/jni/java-net/javanet.c @@ -595,7 +595,14 @@ _javanet_connect(JNIEnv *env, jobject this, jobject addr, jint port) return; } - _javanet_set_remhost(env, this, remote_address); + if (remote_address == netaddr) + { + _javanet_set_remhost_addr(env, this, addr); + } + else + { + _javanet_set_remhost(env, this, remote_address); + } if ((*env)->ExceptionOccurred(env)) { TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd,result); -- cgit v1.2.1