Repository: johnzon Updated Branches: refs/heads/master 80b937db8 -> 55d55856b
fallback for jsonp 1.0 in mapper parser impl Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/55d55856 Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/55d55856 Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/55d55856 Branch: refs/heads/master Commit: 55d55856b033d87464f856d768edb5e96fd587a8 Parents: 80b937d Author: rmannibucau <[email protected]> Authored: Sat Jul 29 10:12:46 2017 +0200 Committer: rmannibucau <[email protected]> Committed: Sat Jul 29 10:12:46 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/55d55856/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java ---------------------------------------------------------------------- diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java index ba28efb..7e3d574 100644 --- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java +++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java @@ -104,6 +104,8 @@ public class MappingParserImpl implements MappingParser { public <T> T readObject(Type targetType) { try { return readObject(jsonReader.readValue(), targetType); + } catch (final NoSuchMethodError noSuchMethodError) { // jsonp 1.0 fallback - mainly for tests + return readObject(jsonReader.read(), targetType); } finally { if (config.isClose()) { jsonReader.close();
