From 8cacfbee74b77c149e15ce38b3029cb5e7110f10 Mon Sep 17 00:00:00 2001 From: Jacek Mleczek Date: Fri, 15 Mar 2019 11:21:43 +0100 Subject: [PATCH] fix NullPointerException when response doesn't have content type --- .../socket/engineio/client/transports/PollingXHR.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/socket/engineio/client/transports/PollingXHR.java b/src/main/java/io/socket/engineio/client/transports/PollingXHR.java index ed118eb3..a1c128aa 100644 --- a/src/main/java/io/socket/engineio/client/transports/PollingXHR.java +++ b/src/main/java/io/socket/engineio/client/transports/PollingXHR.java @@ -268,9 +268,9 @@ private void onResponseHeaders(Map> headers) { private void onLoad() { ResponseBody body = response.body(); - String contentType = body.contentType().toString(); try { + String contentType = getContentTypeFromBody(body); if (BINARY_CONTENT_TYPE.equalsIgnoreCase(contentType)) { this.onData(body.bytes()); } else { @@ -281,6 +281,14 @@ private void onLoad() { } } + private String getContentTypeFromBody(ResponseBody body) { + MediaType mediaType = body.contentType(); + if (mediaType == null) { + return ""; + } + return mediaType.toString(); + } + public static class Options { public String uri;