You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/09/17 18:46:16 UTC

svn commit: r1625648 - in /httpcomponents/httpclient-android/branches/4.3.5-android: ./ RELEASE_NOTES.txt src/main/java/org/apache/http/impl/client/HttpClientBuilder.java

Author: olegk
Date: Wed Sep 17 16:46:15 2014
New Revision: 1625648

URL: http://svn.apache.org/r1625648
Log:
HTTPCLIENT-1553: Fixed IllegalArgumentException in HttpClientBuilder.build() if system properties are not used

Added:
    httpcomponents/httpclient-android/branches/4.3.5-android/RELEASE_NOTES.txt   (with props)
Modified:
    httpcomponents/httpclient-android/branches/4.3.5-android/   (props changed)
    httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java

Propchange: httpcomponents/httpclient-android/branches/4.3.5-android/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 17 16:46:15 2014
@@ -2,3 +2,5 @@ local.properties
 pom.xml
 .idea
 *.iml
+.gradle
+out

Added: httpcomponents/httpclient-android/branches/4.3.5-android/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/RELEASE_NOTES.txt?rev=1625648&view=auto
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.5-android/RELEASE_NOTES.txt (added)
+++ httpcomponents/httpclient-android/branches/4.3.5-android/RELEASE_NOTES.txt Wed Sep 17 16:46:15 2014
@@ -0,0 +1,6 @@
+Changes since 4.3.5
+-------------------
+
+* [HTTPCLIENT-1553] Fixed IllegalArgumentException in HttpClientBuilder.build() if system
+  properties are not used.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>

Propchange: httpcomponents/httpclient-android/branches/4.3.5-android/RELEASE_NOTES.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient-android/branches/4.3.5-android/RELEASE_NOTES.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient-android/branches/4.3.5-android/RELEASE_NOTES.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java?rev=1625648&r1=1625647&r2=1625648&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java Wed Sep 17 16:46:15 2014
@@ -711,15 +711,13 @@ public class HttpClientBuilder {
                             sslcontext, supportedProtocols, supportedCipherSuites, hostnameVerifier);
                 } else {
                     if (systemProperties) {
-                        if (systemProperties) {
-                            sslSocketFactory = new SSLConnectionSocketFactory(
-                                    (SSLSocketFactory) SSLCertificateSocketFactory.getDefault(0),
-                                    supportedProtocols, supportedCipherSuites, hostnameVerifier);
-                        } else {
-                            sslSocketFactory = new SSLConnectionSocketFactory(
-                                    (SSLSocketFactory) SSLCertificateSocketFactory.getDefault(0),
-                                    hostnameVerifier);
-                        }
+                        sslSocketFactory = new SSLConnectionSocketFactory(
+                                (SSLSocketFactory) SSLCertificateSocketFactory.getDefault(0),
+                                supportedProtocols, supportedCipherSuites, hostnameVerifier);
+                    } else {
+                        sslSocketFactory = new SSLConnectionSocketFactory(
+                                (SSLSocketFactory) SSLCertificateSocketFactory.getDefault(0),
+                                hostnameVerifier);
                     }
                 }
             }