| commit | c7bbbe662f4ed44fa490d091b9a26e9706b5cfb9 | [log] [tgz] |
|---|---|---|
| author | Cowtowncoder <tatu.saloranta@iki.fi> | Wed Nov 26 10:33:55 2014 -0800 |
| committer | Cowtowncoder <tatu.saloranta@iki.fi> | Wed Nov 26 10:33:55 2014 -0800 |
| tree | a8d320a28b05e5d7da7af66daef6235a84bf267b | |
| parent | 603991b7813511725e464d9189f3db4742730334 [diff] | |
| parent | 7d4201c6768db3feb83c5d441195d9e4a6f25a08 [diff] |
Merge branch '2.4' Conflicts: src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java
diff --git a/release-notes/VERSION b/release-notes/VERSION index ba3de3f..d19fc58 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION
@@ -58,6 +58,7 @@ #635: Reduce cachability of `Map` deserializers, to avoid problems with per-property config changes (regression due to #604) +- Solve potential cyclic-resolution problem for `UntypedObjectDeserializer` 2.4.4 (24-Nov-2014)
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java index c40eb22..505aa1f 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java
@@ -165,7 +165,7 @@ */ @Override public boolean isCachable() { return true; } - + @Override public Object deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {