Merge branch 'release-3.2' into cherry-pick-2667-to-release-3.2

pingcap · Apr 26, 2023 · 0c036cb · 0c036cb
2 parents cf5ab14 + 1d7009e
commit 0c036cb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/tikv-client/src/main/java/com/pingcap/tikv/catalog/CatalogTransaction.java b/tikv-client/src/main/java/com/pingcap/tikv/catalog/CatalogTransaction.java
@@ -19,6 +19,7 @@
 import static com.pingcap.tikv.codec.MetaCodec.KEY_DBs;
 
 import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.pingcap.tikv.Snapshot;
@@ -51,6 +52,7 @@ public static <T> T parseFromJson(ByteString json, Class<T> cls) {
 
     logger.debug(String.format("Parse Json %s : %s", cls.getSimpleName(), json.toStringUtf8()));
     ObjectMapper mapper = new ObjectMapper();
+    mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     try {
       return mapper.readValue(json.toStringUtf8(), cls);
     } catch (JsonParseException | JsonMappingException e) {