commit | 3a446dfd9f0c9d17de3774483a904d18b704b233 | [log] [tgz] |
---|---|---|
author | Tatu Saloranta <tatu.saloranta@iki.fi> | Thu Feb 13 16:16:14 2014 -0800 |
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | Thu Feb 13 16:16:14 2014 -0800 |
tree | 849c2cf414211c45913bf864f12d6ae57eaf228f | |
parent | ea2d74fab79f1ba140918d4efb6d728fc021a319 [diff] | |
parent | 0cdf42fe5ac175b1b852e735a3265588919ffe32 [diff] |
Merge branch 'master' of github.com:FasterXML/jackson-databind
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java index d3b4984..d5ae69f 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
@@ -515,7 +515,12 @@ } return true; } - + if (type == boolean.class || type == Boolean.class) { + if (isCreator || isVisible) { + creators.addBooleanCreator(ctor); + } + return true; + } // Delegating Creator ok iff it has @JsonCreator (etc) if (isCreator) { creators.addDelegatingCreator(ctor, null);
diff --git a/src/test/java/com/fasterxml/jackson/databind/creators/TestCreators.java b/src/test/java/com/fasterxml/jackson/databind/creators/TestCreators.java index ca5d0b8..0a9a371 100644 --- a/src/test/java/com/fasterxml/jackson/databind/creators/TestCreators.java +++ b/src/test/java/com/fasterxml/jackson/databind/creators/TestCreators.java
@@ -37,14 +37,14 @@ */ static class BooleanConstructorBean { Boolean b; - @JsonCreator protected BooleanConstructorBean(Boolean b) { + protected BooleanConstructorBean(Boolean b) { this.b = b; } } static class BooleanConstructorBean2 { boolean b; - @JsonCreator protected BooleanConstructorBean2(boolean b) { + protected BooleanConstructorBean2(boolean b) { this.b = b; } }