From 1645efbd392989cf015f459a91c999e59c921b15 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Tue, 17 Mar 2020 22:08:30 -0700 Subject: [PATCH] Fix #2660 --- release-notes/VERSION-2.x | 2 ++ .../jackson/databind/jsontype/impl/SubTypeValidator.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 0461b34deb..30bb09fe11 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -17,6 +17,8 @@ Project: jackson-databind #2658: Block one more gadget type (ignite-jta) #2659: Block one more gadget type (aries.transaction.jms) (reported by Srikanth Ramu) +#2660: Block one more gadget type (caucho-quercus) + (reported by threedr3am) 2.9.10.3 (23-Feb-2020) diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java index 36e60d89fc..387733f613 100644 --- a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java +++ b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java @@ -149,7 +149,11 @@ public class SubTypeValidator // [databind#2659]: aries.transaction.jms s.add("org.apache.aries.transaction.jms.internal.XaPooledConnectionFactory"); + s.add("org.apache.aries.transaction.jms.RecoverablePooledConnectionFactory"); + // [databind#2660]: caucho-quercus + s.add("com.caucho.config.types.ResourceRef"); + DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s); }