Merge branch '1.2.x'

2018-11-01 07:04:45 +00:00
parent eedc69836e e23c6b45d4
commit 9deae49795
2 changed files with 10 additions and 1 deletions
--- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonContentHandler.java
+++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonContentHandler.java
@@ -86,7 +86,7 @@ class JsonContentHandler implements ContentHandler {
 		}
 		ExtractedField extracted = this.fieldProcessor.extract(candidate.getPath(),
 				payload);
-		return isEmptyCollection(extracted.getValue());
+		return extracted.getValue() == null || isEmptyCollection(extracted.getValue());
 	}

 	private boolean isEmptyCollection(Object value) {