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/12/30 22:07:37 UTC

svn commit: r1648599 - /httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java

Author: olegk
Date: Tue Dec 30 21:07:37 2014
New Revision: 1648599

URL: http://svn.apache.org/r1648599
Log:
HTTPCLIENT-1554: RequestConfig has no effect when using Android HttpRequest classes (fixed sloppy check causing NPE)

Modified:
    httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java

Modified: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java?rev=1648599&r1=1648598&r2=1648599&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java Tue Dec 30 21:07:37 2014
@@ -59,7 +59,7 @@ public final class HttpClientParamConfig
             final Field f = params.getClass().getDeclaredField("parameters");
             f.setAccessible(true);
             final Map<?, ?> map = (Map<?, ?>) f.get(params);
-            if (map.isEmpty()) {
+            if (map == null || map.isEmpty()) {
                 return null;
             }
         } catch (Exception ignore) {