Fixed NPE in DefaultRequestDirector thrown when retrying a failed request over a proxied connection

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@723813 13f79535-47bb-0310-9956-ffa450edef68

RELEASE_NOTES.txt

@@ -9,6 +9,10 @@ bundle combining HttpClient and HttpMime jars.
 
 All upstream projects are strongly encouraged to upgrade.
 
+* Fixed NPE in DefaultRequestDirector thrown when retrying a failed 
+  request over a proxied connection. 
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
 * [HTTPCLIENT-803] Fixed bug in SSL host verifier implementations 
   causing the SSL certificate to be rejected as invalid if the connection 
   is established using an IP address.

module-client/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java

@@ -434,6 +434,7 @@ public class DefaultRequestDirector implements RequestDirector {
                             managedConn.open(route, context, params);
                         } else {
                             // otherwise give up
+                            this.log.debug("Proxied connection. Need to start over.");
                             retrying = false;
                         }
                         
@@ -441,6 +442,11 @@ public class DefaultRequestDirector implements RequestDirector {
 
                 }
                 
+                if (response == null) {
+                    // Need to start over
+                    continue;
+                }
+
                 // Run response protocol interceptors
                 response.setParams(params);
                 requestExec.postProcess(response, httpProcessor, context);