hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r940069 - /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
Date Sat, 01 May 2010 16:16:59 GMT
Author: sebb
Date: Sat May  1 16:16:59 2010
New Revision: 940069

URL: http://svn.apache.org/viewvc?rev=940069&view=rev
Log:
HTTPCLIENT-932 Fix possible NPE - use sslsock rather than sock

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=940069&r1=940068&r2=940069&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
Sat May  1 16:16:59 2010
@@ -364,7 +364,7 @@ public class SSLSocketFactory implements
         }
         SSLSocket sslsock = (SSLSocket) (sock != null ? sock : createSocket());
         if (localAddress != null) {
-            sock.setReuseAddress(HttpConnectionParams.getSoReuseaddr(params));
+            sslsock.setReuseAddress(HttpConnectionParams.getSoReuseaddr(params));
             sslsock.bind(localAddress);
         }
 



Mime
View raw message