Skip to content

Commit 35707e5

Browse files
committed
Minor tweak post #4216
1 parent 9f7abad commit 35707e5

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -1346,11 +1346,9 @@ public JsonDeserializer<?> createArrayDeserializer(DeserializationContext ctxt,
13461346
config, beanDesc, elemTypeDeser, contentDeser);
13471347
if (deser == null) {
13481348
if (contentDeser == null) {
1349-
Class<?> raw = elemType.getRawClass();
13501349
if (elemType.isPrimitive()) {
1351-
deser = PrimitiveArrayDeserializers.forType(raw);
1352-
}
1353-
if (raw == String.class) {
1350+
deser = PrimitiveArrayDeserializers.forType(elemType.getRawClass());
1351+
} else if (elemType.hasRawClass(String.class)) {
13541352
deser = StringArrayDeserializer.instance;
13551353
}
13561354
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static JsonDeserializer<?> forType(Class<?> rawType)
9999
if (rawType == Character.TYPE) {
100100
return new CharDeser();
101101
}
102-
throw new IllegalStateException();
102+
throw new IllegalArgumentException("Unknown primitive array element type: "+rawType);
103103
}
104104

105105
@Override

0 commit comments

Comments
 (0)