diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-03-11 16:25:44 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-03-11 16:25:44 -0700 |
| commit | 02179c618b0e201e8476c9e8a6f46a754822133b (patch) | |
| tree | ee5405a0bac6f8a9274e0608ad955fcbd5b67a41 /src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java | |
| parent | 479a5c4d600dfbd6e7d279d0a0af2909a107cdc0 (diff) | |
| parent | 82d5d10089d6ac311a41548502b7433016c46fc8 (diff) | |
| download | jackson-databind-02179c618b0e201e8476c9e8a6f46a754822133b.tar.gz | |
Merge branch '2.9' into 2.10
Diffstat (limited to 'src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 514e82c45..b9745c23a 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 @@ -138,8 +138,9 @@ public class SubTypeValidator // [databind#2642]: javax.swing (jdk) s.add("javax.swing.JEditorPane"); - // [databind#2648]: shire-core + // [databind#2648], [databind#2653]: shire-core s.add("org.apache.shiro.realm.jndi.JndiRealmFactory"); + s.add("org.apache.shiro.jndi.JndiObjectFactory"); DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s); } |