Skip to content

Commit 6660ca1

Browse files
authored
Fix #4581: handle nulls for caseInsensitive (#4582)
1 parent 2dc148f commit 6660ca1

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

release-notes/VERSION-2.x

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Project: jackson-databind
44
=== Releases ===
55
------------------------------------------------------------------------
66

7+
Not yet released:
8+
9+
#4581: Incompatible Constructor Parameter Type in `EnumDeserializer`
10+
(reported by @Hunter-Lam)
11+
712
2.15.4 (15-Feb-2024)
813

914
#1172: `@JsonView` doesn't work with `@JsonCreator`

src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ public class EnumDeserializer
7979
*/
8080
public EnumDeserializer(EnumResolver byNameResolver, Boolean caseInsensitive)
8181
{
82-
this(byNameResolver, caseInsensitive, null);
82+
this(byNameResolver, Boolean.TRUE.equals(caseInsensitive), null);
8383
}
8484

8585
/**
8686
* @since 2.15
8787
*/
8888
public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
89-
EnumResolver byEnumNamingResolver)
89+
EnumResolver byEnumNamingResolver)
9090
{
9191
super(byNameResolver.getEnumClass());
9292
_lookupByName = byNameResolver.constructLookup();
@@ -107,7 +107,7 @@ protected EnumDeserializer(EnumDeserializer base, Boolean caseInsensitive,
107107
_lookupByName = base._lookupByName;
108108
_enumsByIndex = base._enumsByIndex;
109109
_enumDefaultValue = base._enumDefaultValue;
110-
_caseInsensitive = caseInsensitive;
110+
_caseInsensitive = Boolean.TRUE.equals(caseInsensitive);
111111
_isFromIntValue = base._isFromIntValue;
112112
_useDefaultValueForUnknownEnum = useDefaultValueForUnknownEnum;
113113
_useNullForUnknownEnum = useNullForUnknownEnum;

0 commit comments

Comments
 (0)