Merge branch '1.2.x'

2018-06-25 17:07:45 +01:00
parent a8711e984d 20bc7b3cd8
commit 2a1a3bcc7d
1 changed files with 2 additions and 5 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
@@ -84,11 +84,8 @@ class JsonContentHandler implements ContentHandler {
 		try {
 			ExtractedField extracted = this.fieldProcessor.extract(candidate.getPath(),
 					payload);
-			if (extracted.getValue() instanceof Collection
-					&& ((Collection<?>) extracted.getValue()).isEmpty()) {
-				return true;
-			}
-			return false;
+			return extracted.getValue() instanceof Collection
+					&& ((Collection<?>) extracted.getValue()).isEmpty();
 		}
 		catch (FieldDoesNotExistException ex) {
 			return true;