Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 1c9d9e4b1 -> 2f3ba6e5c
Completing the NPE checking code in the basic json writer Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2f3ba6e5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2f3ba6e5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2f3ba6e5 Branch: refs/heads/3.1.x-fixes Commit: 2f3ba6e5c524e764cef966c185b437380a1d624d Parents: 1c9d9e4 Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Fri Dec 2 16:50:13 2016 +0000 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Fri Dec 2 16:51:20 2016 +0000 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2f3ba6e5/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java index d1fb1f5..abf6eef 100644 --- a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java +++ b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java @@ -305,6 +305,9 @@ public class JsonMapObjectReaderWriter { @Override public Output append(String str) { try { + if (str == null) { + str = "null"; + } os.write(StringUtils.toBytesUTF8(str)); } catch (IOException ex) { throw new RuntimeException(ex);
