From 1c23733ce212d7185e6c8a4a43de66e67e1038e5 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 16 Apr 2007 20:13:28 +0000
Subject: [PATCH] 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
---
 libjava/classpath/ChangeLog                   |   6 ++++++
 .../ssl/provider/SSLSocketFactoryImpl.java    |  20 ++++++++----------
 .../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 712c9eb400f..c1c14a6a40b 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 6c804f9c629..6a3d7352eda 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
index de053ac51df6f0e26fd94bce302b1fa8e67fda4e..9de6329b2407630a8ff42cee29be89b1c0cfa35a 100644
GIT binary patch
delta 830
zcmZ{hO-~b16o%hRXYQ0T4IfJBG=*Aq(T_C6))hu9RSPHziWZ81l%kbV$4H1S8~oT9
zT$u9@+_59kw236f#JFPXO8<e0|G_ge%~V6&+?#XWbI*D2bH0Z@g%0+V9)SrRCy*B?
z(r+zAZ)H*s;))IpS6PeEoEmv|q|;YrNKDdCC6X*)+ET9x1Y$F_^0RWfUN)=g`JL@e
zvwC4VUi6`W8LQ+5^~<P#R>vG}2`KBE<_4wJk&`|IF|Xr}mDMUwO!Glyhc3x1&8iEu
zEemXF#WJ-jutZ<9AidEH%a~llx`r}+mWHQ-4f-KR>8X}i1QIb4-jsY~y}C!gv>cuH
z#(h2r)UDLT4=dh%(U^n^4}k7OGAukz<PJFKLNA|^OMx}?@p;NALO%vL;&MbdXX)LD
z;xxYy7BRjDIVbrJV4O8zp9g4sXAco9B|gHR47YH3Og%)Qlnggom>QFY9i;}97OppO
z(@+iB#BD?EcnNS9pvJzo5JDYsJjN(Y+uM}W-}RPty=B|pcslN)X#XLL1@^0Or?VJ_
ze~}x9V4#F0NE+!GI!0u<<H8~G{J%ts$B3-9i72cDY##4<pya<~Tpmr_caYc^8l}HD
zIFM{A|KJGOEq39>3;40iOL@s(eT6h$+vdid5iXJpBXP`STqGG6Nv4ftfLA))g+<Ei
k39(G){D$nC;I%%aJv}0-R)W5<l<P<}>h(v(7AMa90nJi*G5`Po

delta 886
zcma)(&2JJx7>9qO`z0>4(3X!)rBJ`<k_{U5QX>(mRTOKrilU<BOKh#%gc5_A$Vt8E
zp_#wJ8%9GDd+XJ!@$Auq{tv!0D1ImICX?COcYg0P&%CwXTixf1H;jx49VZwviTwI-
zbp4&l_o*Q^!_(@-kt}A#-%||1M1Hw^znoeryN%RBtGVPhj^?Hc9)yuIaRz4@^y;eX
z)~hYvQ=<xlO>uj8Mmxv~{EP1J7n(DA!NdrTd630|$i2j1B{(y}0U1;<aYY0vl_j^v
zKdFa!Q=6SE;g*h@45PBYTW_UuG-PVEW_@kV#3IT(qaWZ~TFGFji3ZpCsy@R%>WZf!
zJ}bl`x+M8$JuQ~CyJGn~w~eXSCF3RQbfD4;#5WNx+Hc@Zj&I=j+$OR`F*`Y}I1#0X
z(@vL)wqc0I02CS*;X@e_R4{=mhH2$+KL~!R5Ko-`#K7b%j!D|>qu#ra$9CFh;2h?l
zD^wtWUYR4E#}uGZxn(EEdzhbABdXwV#*__Q?BQ}m{Q=>l5a1rgxCmiY0;K!92LRRp
zz#<p{K-sv8qTFlY8m%dm5RgzR_wNjK+QcA^7aREK;f7S=e0M@9KkEp}W49^i0la8a
z_lJn$ktDMFSp%XN5f!D9*f%0SDeWr}9x5Gz9HaI^OAtF~_N$cYe@J;kC{IbsvwuqI
zBm7Ou&~H|F!nE0K{=tmK@BD$bpFE0N(B*wqMHTOwd)cy>u@!Nr-0=F?JP&zye+3Zh
BhPD6z

-- 
2.30.2