Minor tweak wrt #3838 to ease merging to 3.0

cowtowncoder · cowtowncoder · commit 1acfdc14cac8 · 2023-06-12T17:18:15.000-07:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -369,7 +369,7 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t
             }
         }
         // [databind#3838]: since 2.16 Uniform handling of missing objectId
-        if (_objectIdReader != null && p.getCurrentToken() == JsonToken.END_OBJECT) {
+        if (_objectIdReader != null && p.hasTokenId(JsonTokenId.ID_END_OBJECT)) {
             ctxt.reportUnresolvedObjectId(_objectIdReader, bean);
         }
         if (_injectables != null) {

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t`
`369`	`369`	`}`
`370`	`370`	`}`
`371`	`371`	`// [databind#3838]: since 2.16 Uniform handling of missing objectId`
`372`		`- if (_objectIdReader != null && p.getCurrentToken() == JsonToken.END_OBJECT) {`
	`372`	`+ if (_objectIdReader != null && p.hasTokenId(JsonTokenId.ID_END_OBJECT)) {`
`373`	`373`	`ctxt.reportUnresolvedObjectId(_objectIdReader, bean);`
`374`	`374`	`}`
`375`	`375`	`if (_injectables != null) {`