diff options
| -rw-r--r-- | libjava/classpath/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java | 20 | ||||
| -rw-r--r-- | libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class | bin | 3412 -> 3386 bytes |
3 files changed, 15 insertions, 11 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 712c9eb..c1c14a6 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,9 @@ +2007-04-16 Tom Tromey <tromey@redhat.com> + + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=236614 + * gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java + (createSocket): Change order of delegation. + 2007-04-16 Andrew Haley <aph@redhat.com> * java/io/ObjectInputStream.java: (parseContent): Call (String, diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java index 6c804f9..6a3d735 100644 --- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java +++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java @@ -1,5 +1,5 @@ /* SSLSocketFactoryImpl.java -- - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -93,10 +93,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory @Override public SSLSocketImpl createSocket(String host, int port) throws IOException, UnknownHostException { - SSLSocketImpl socket = new SSLSocketImpl(contextImpl, host, port); - InetSocketAddress endpoint = new InetSocketAddress(host, port); - socket.connect(endpoint); - return socket; + return createSocket(host, port, null, 0); } /* (non-Javadoc) @@ -106,8 +103,10 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory InetAddress localHost, int localPort) throws IOException, UnknownHostException { - SSLSocketImpl socket = createSocket(host, port); + SSLSocketImpl socket = new SSLSocketImpl(contextImpl, host, port); + InetSocketAddress endpoint = new InetSocketAddress(host, port); socket.bind(new InetSocketAddress(localHost, localPort)); + socket.connect(endpoint); return socket; } @@ -117,10 +116,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory @Override public SSLSocketImpl createSocket(InetAddress host, int port) throws IOException { - SSLSocketImpl socket = new SSLSocketImpl(contextImpl, - host.getCanonicalHostName(), port); - socket.connect(new InetSocketAddress(host, port)); - return socket; + return createSocket(host, port, null, 0); } /* (non-Javadoc) @@ -130,8 +126,10 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory InetAddress localHost, int localPort) throws IOException { - SSLSocketImpl socket = createSocket(host, port); + SSLSocketImpl socket = new SSLSocketImpl(contextImpl, + host.getCanonicalHostName(), port); socket.bind(new InetSocketAddress(localHost, localPort)); + socket.connect(new InetSocketAddress(host, port)); return socket; } } diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class Binary files differindex de053ac..9de6329 100644 --- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class +++ b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class |