diff options
| author | Tom Tromey <tromey@redhat.com> | 2007-04-16 20:13:28 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-04-16 20:13:28 +0000 |
| commit | 1c23733ce212d7185e6c8a4a43de66e67e1038e5 (patch) | |
| tree | 29cd3c913d20f5e10059ff4933bf76272a80d261 /libjava/classpath/gnu/javax | |
| parent | bdede2ace5b8e8857f60019b99c55afd5d263a33 (diff) | |
| download | gcc-1c23733ce212d7185e6c8a4a43de66e67e1038e5.zip gcc-1c23733ce212d7185e6c8a4a43de66e67e1038e5.tar.gz gcc-1c23733ce212d7185e6c8a4a43de66e67e1038e5.tar.bz2 | |
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=236614
* gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
(createSocket): Change order of delegation.
From-SVN: r123889
Diffstat (limited to 'libjava/classpath/gnu/javax')
| -rw-r--r-- | libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java | 20 |
1 files changed, 9 insertions, 11 deletions
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; } } |