guard against requests with no content type

pact-foundation · Jul 2, 2015 · 0425a97 · 0425a97
1 parent 2c03a20
commit 0425a97
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pact-jvm-model/src/main/scala/au/com/dius/pact/model/unfiltered/Conversions.scala b/pact-jvm-model/src/main/scala/au/com/dius/pact/model/unfiltered/Conversions.scala
@@ -21,7 +21,10 @@ object Conversions {
   }
 
   implicit def dispatchResponseToPactResponse(response: client.Response): Response = {
-    val contentType = org.apache.http.entity.ContentType.parse(response.getContentType)
+    val contentType = if (response.getContentType == null)
+        org.apache.http.entity.ContentType.APPLICATION_JSON
+      else
+        org.apache.http.entity.ContentType.parse(response.getContentType)
     val charset = if (contentType.getCharset == null) "UTF-8" else contentType.getCharset.name()
     Response(response.getStatusCode, Some(toMap(response.getHeaders)), Some(response.getResponseBody(charset)), None)
   }