Repository: cxf Updated Branches: refs/heads/3.0.x-fixes e9c0d73b3 -> 14e5105e6
[CXF-6166] Trying to convert to Double if the conversion to Long fails, patch from Daniel Torkian applied Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/14e5105e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/14e5105e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/14e5105e Branch: refs/heads/3.0.x-fixes Commit: 14e5105e661009d47a1759b6decaa11fe58bbdb5 Parents: e9c0d73 Author: Sergey Beryozkin <[email protected]> Authored: Tue Jan 6 11:39:22 2015 +0300 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Jan 6 11:41:13 2015 +0300 ---------------------------------------------------------------------- .../cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/14e5105e/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java index 343bad5..dac1459 100644 --- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java +++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java @@ -201,7 +201,11 @@ public class JsonMapObjectReaderWriter { } else if ("true".equals(value) || "false".equals(value)) { value = Boolean.valueOf(valueStr); } else { - value = Long.valueOf(valueStr); + try { + value = Long.valueOf(valueStr); + } catch (NumberFormatException ex) { + value = Double.valueOf(valueStr); + } } return value; }
