summaryrefslogtreecommitdiffstats
path: root/hadoop
diff options
context:
space:
mode:
authorLester Solbakken <lesters@yahoo-inc.com>2016-08-18 13:42:40 +0200
committerLester Solbakken <lesters@yahoo-inc.com>2016-08-18 13:42:40 +0200
commit4cb8350676dc8a10c57404d842a77d41bcfd6f2b (patch)
tree9de963073b174712d5f03d2446c34da0e4e758b2 /hadoop
parent664aa9d588a7ea19eab97d1a8b4f3ee7c7156500 (diff)
Fix hang on non-200 responses on hadoop query
Diffstat (limited to 'hadoop')
-rw-r--r--hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaHttpClient.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaHttpClient.java b/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaHttpClient.java
index d62ec99d1bd..e63a4044c95 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaHttpClient.java
+++ b/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaHttpClient.java
@@ -30,10 +30,6 @@ public class VespaHttpClient {
public String get(String url) throws IOException {
HttpGet httpGet = new HttpGet(url);
HttpResponse httpResponse = httpClient.execute(httpGet);
- if (httpResponse.getStatusLine().getStatusCode() != 200) {
- return null;
- }
-
HttpEntity entity = httpResponse.getEntity();
InputStream is = entity.getContent();
@@ -44,6 +40,10 @@ public class VespaHttpClient {
}
EntityUtils.consume(entity);
+ if (httpResponse.getStatusLine().getStatusCode() != 200) {
+ return null;
+ }
+
return result;
}