summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2011-09-27 19:25:59 -0400
committerJesse Wilson <jessewilson@google.com>2011-09-27 19:25:59 -0400
commit6c9d8c58d3ed710f87c26820d903bb8aad81754f (patch)
treeb5d63e995d759da94a90614fff3d04f009b34b6f /src
parentab691647a3d375ba17920e25ec8c8f9d6a80c5bf (diff)
downloadexternal_apache-http-6c9d8c58d3ed710f87c26820d903bb8aad81754f.zip
external_apache-http-6c9d8c58d3ed710f87c26820d903bb8aad81754f.tar.gz
external_apache-http-6c9d8c58d3ed710f87c26820d903bb8aad81754f.tar.bz2
Fix NPE in DefaultRequestDirector
When the HTTP client encountered a server failure while talking through a proxy, it fails with an NullPointerException and not an IOException. Bug: http://b/5372438 Change-Id: I67848d52f5d01c9e353fcc7d66d48ec821d9b4ba
Diffstat (limited to 'src')
-rw-r--r--src/org/apache/http/impl/client/DefaultRequestDirector.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/apache/http/impl/client/DefaultRequestDirector.java b/src/org/apache/http/impl/client/DefaultRequestDirector.java
index bfdddd6..9f6d832 100644
--- a/src/org/apache/http/impl/client/DefaultRequestDirector.java
+++ b/src/org/apache/http/impl/client/DefaultRequestDirector.java
@@ -452,7 +452,7 @@ public class DefaultRequestDirector implements RequestDirector {
managedConn.open(route, context, params);
} else {
// otherwise give up
- retrying = false;
+ throw ex;
}
}