From 732b7d401c12792157245399e2c57a1e61abd9ad Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Mon, 18 Nov 2019 14:20:00 +0100
Subject: [PATCH] Added NPE guard when there are no bytes returned

---
 .../wiremock/restdocs/WireMockVerifyHelper.java       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockVerifyHelper.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockVerifyHelper.java
index 43a73b7130..a64d9ab4dd 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockVerifyHelper.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockVerifyHelper.java
@@ -57,10 +57,13 @@ public abstract class WireMockVerifyHelper<T, S extends WireMockVerifyHelper<T,
 
 	public void configure(T result) {
 		Map<String, Object> configuration = getConfiguration(result);
-		String actual = new String(getRequestBodyContent(result),
-				Charset.forName("UTF-8"));
-		for (JsonPath jsonPath : this.jsonPaths.values()) {
-			new JsonPathValue(jsonPath, actual).assertHasValue(Object.class, "an object");
+		byte[] requestBodyContent = getRequestBodyContent(result);
+		if (requestBodyContent != null) {
+			String actual = new String(requestBodyContent,
+					Charset.forName("UTF-8"));
+			for (JsonPath jsonPath : this.jsonPaths.values()) {
+				new JsonPathValue(jsonPath, actual).assertHasValue(Object.class, "an object");
+			}
 		}
 		configuration.put("contract.jsonPaths", this.jsonPaths.keySet());
 		if (this.contentType != null) {