Skip to content

Commit b3c488b

Browse files
committed
Merge branch '2.9' of https://github.com/FasterXML/jackson-databind into 2.9
2 parents b30fa09 + a65606f commit b3c488b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public abstract class BasicDeserializerFactory
4141
{
4242
private final static Class<?> CLASS_OBJECT = Object.class;
4343
private final static Class<?> CLASS_STRING = String.class;
44-
private final static Class<?> CLASS_CHAR_BUFFER = CharSequence.class;
44+
private final static Class<?> CLASS_CHAR_SEQUENCE = CharSequence.class;
4545
private final static Class<?> CLASS_ITERABLE = Iterable.class;
4646
private final static Class<?> CLASS_MAP_ENTRY = Map.Entry.class;
4747

@@ -973,7 +973,7 @@ protected boolean _handleSingleArgumentCreator(CreatorCollector creators,
973973
{
974974
// otherwise either 'simple' number, String, or general delegate:
975975
Class<?> type = ctor.getRawParameterType(0);
976-
if (type == String.class || type == CharSequence.class) {
976+
if (type == String.class || type == CLASS_CHAR_SEQUENCE) {
977977
if (isCreator || isVisible) {
978978
creators.addStringCreator(ctor, isCreator);
979979
}
@@ -1770,7 +1770,7 @@ public JsonDeserializer<?> findDefaultDeserializer(DeserializationContext ctxt,
17701770
}
17711771
return new UntypedObjectDeserializer(lt, mt);
17721772
}
1773-
if (rawType == CLASS_STRING || rawType == CLASS_CHAR_BUFFER) {
1773+
if (rawType == CLASS_STRING || rawType == CLASS_CHAR_SEQUENCE) {
17741774
return StringDeserializer.instance;
17751775
}
17761776
if (rawType == CLASS_ITERABLE) {

0 commit comments

Comments
 (0)