From 30e861e015d2028928f523e24ff5be2eb0c18176 Mon Sep 17 00:00:00 2001 From: jhowarth Date: Fri, 27 Sep 2013 14:49:42 -0700 Subject: [PATCH] Handle empty response content in MonkeyRestClient. --- .../java/com/netflix/simianarmy/client/MonkeyRestClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/netflix/simianarmy/client/MonkeyRestClient.java b/src/main/java/com/netflix/simianarmy/client/MonkeyRestClient.java index a3a9c75a..a904d22d 100644 --- a/src/main/java/com/netflix/simianarmy/client/MonkeyRestClient.java +++ b/src/main/java/com/netflix/simianarmy/client/MonkeyRestClient.java @@ -59,7 +59,8 @@ public JsonNode getJsonNodeFromUrl(String url) throws IOException { InputStream is = response.getEntity().getContent(); String jsonContent; if (is != null) { - jsonContent = new Scanner(is, "UTF-8").useDelimiter("\\A").next(); + Scanner s = new Scanner(is, "UTF-8").useDelimiter("\\A"); + jsonContent = s.hasNext() ? s.next() : ""; is.close(); } else { return null;