Skip to content

Commit 5d9009b

Browse files
committed
Merge branch '2.17' into 2.18
2 parents 5888994 + 11f9b4a commit 5d9009b

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public final class DeserializerCache
4242
/**
4343
* We will also cache some dynamically constructed deserializers;
4444
* specifically, ones that are expensive to construct.
45-
* This currently means bean, Enum and container deserializers.
45+
* This currently means POJO, Enum and Container deserializers.
4646
*/
4747
protected final LookupCache<JavaType, JsonDeserializer<Object>> _cachedDeserializers;
4848

@@ -56,6 +56,9 @@ public final class DeserializerCache
5656

5757
/**
5858
* We hold an explicit lock while creating deserializers to avoid creating duplicates.
59+
* Guards {@link #_incompleteDeserializers}.
60+
*
61+
* @since 2.17
5962
*/
6063
private final ReentrantLock _incompleteDeserializersLock = new ReentrantLock();
6164

@@ -170,10 +173,9 @@ public JsonDeserializer<Object> findValueDeserializer(DeserializationContext ctx
170173
// If not, need to request factory to construct (or recycle)
171174
deser = _createAndCacheValueDeserializer(ctxt, factory, propertyType);
172175
if (deser == null) {
173-
/* Should we let caller handle it? Let's have a helper method
174-
* decide it; can throw an exception, or return a valid
175-
* deserializer
176-
*/
176+
// Should we let caller handle it? Let's have a helper method
177+
// decide it; can throw an exception, or return a valid
178+
// deserializer
177179
deser = _handleUnknownValueDeserializer(ctxt, propertyType);
178180
}
179181
}

0 commit comments

Comments
 (0)