diff options
author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-20 17:43:31 -0700 |
---|---|---|
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-20 17:43:31 -0700 |
commit | acfc72821c270acf151d394f3f1c1dbacd49afca (patch) | |
tree | b8043664e64b59634d3939f106413ba3b1149774 /src | |
parent | eeac38b29b8bb011f1741fdd2253c71a7635a88c (diff) | |
parent | 6cc9f1a1af323cd156f5668a47e43bab324ae16f (diff) | |
download | jackson-databind-acfc72821c270acf151d394f3f1c1dbacd49afca.tar.gz |
Merge branch '2.9' into 2.10
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java | 3 |
1 files changed, 3 insertions, 0 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 56ceb58e0..8a1cae406 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 @@ -197,6 +197,9 @@ public class SubTypeValidator // [databind#2764]: org.jsecurity: s.add("org.jsecurity.realm.jndi.JndiRealmFactory"); + // [databind#2798]: com.pastdev.httpcomponents: + s.add("com.pastdev.httpcomponents.configuration.JndiConfiguration"); + DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s); } |