From ce17416e16de08a70b7fc4460cdfd8c34d9283f7 Mon Sep 17 00:00:00 2001 From: Simon Allegraud Date: Tue, 16 Jan 2018 11:43:40 +0100 Subject: [PATCH] =?UTF-8?q?DATAREST-1181=20-=20Prevent=20NullPointerExcept?= =?UTF-8?q?ion=20during=20JsonLateObjectEvaluator.evaluate(=E2=80=A6).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original pull request: #287. --- .../data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java index 29de507f6..1ad7ac28a 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java @@ -27,6 +27,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; * @author Craig Walls * @author Oliver Trosien * @author Oliver Gierke + * @author Simon Allegraud */ @RequiredArgsConstructor class JsonLateObjectEvaluator implements LateObjectEvaluator { @@ -42,7 +43,7 @@ class JsonLateObjectEvaluator implements LateObjectEvaluator { public Object evaluate(Class type) { try { - return mapper.readValue(valueNode.traverse(), type); + return mapper.readValue(valueNode.traverse(mapper.getFactory().getCodec()), type); } catch (Exception o_O) { throw new PatchException(String.format("Could not read %s into %s!", valueNode, type), o_O); }