Merge pull request #35 from techery/fix-okclient-nocontent

Fix parsing for contentType in OkClient when a response has no body.
techery · Mar 16, 2016 · 3540f84 · 3540f84
2 parents b8ba429 + f9f5023
commit 3540f84
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/janet-http/http-clients/okhttp/src/main/java/io/techery/janet/okhttp/OkClient.java b/janet-http/http-clients/okhttp/src/main/java/io/techery/janet/okhttp/OkClient.java
@@ -65,9 +65,15 @@ public OkClient(com.squareup.okhttp.OkHttpClient okHttpClient) {
         for (String headerName : okResponse.headers().names()) {
             responseHeaders.add(new Header(headerName, okResponse.header(headerName)));
         }
-        ActionBody responseBody = new BytesArrayBody(
-                okResponse.body().contentType().toString(), okResponse.body().bytes()
-        );
+        ActionBody responseBody = null;
+        if (okResponse.body() != null) {
+            String contentType = null;
+            MediaType mediaType = okResponse.body().contentType();
+            if (mediaType != null) {
+                contentType = mediaType.toString();
+            }
+            responseBody = new BytesArrayBody(contentType, okResponse.body().bytes());
+        }
         return new Response(
                 okResponse.request().url().toString(),
                 okResponse.code(), okResponse.message(), responseHeaders, responseBody

diff --git a/janet-http/http-clients/okhttp3/src/main/java/io/techery/janet/okhttp3/OkClient.java b/janet-http/http-clients/okhttp3/src/main/java/io/techery/janet/okhttp3/OkClient.java
@@ -63,9 +63,15 @@ public OkClient(OkHttpClient okHttpClient) {
         for (String headerName : okResponse.headers().names()) {
             responseHeaders.add(new Header(headerName, okResponse.header(headerName)));
         }
-        ActionBody responseBody = new BytesArrayBody(
-                okResponse.body().contentType().toString(), okResponse.body().bytes()
-        );
+        ActionBody responseBody = null;
+        if (okResponse.body() != null) {
+            String contentType = null;
+            MediaType mediaType = okResponse.body().contentType();
+            if (mediaType != null) {
+                contentType = mediaType.toString();
+            }
+            responseBody = new BytesArrayBody(contentType, okResponse.body().bytes());
+        }
         return new Response(
                 okResponse.request().url().toString(),
                 okResponse.code(), okResponse.message(), responseHeaders, responseBody