diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-20 17:46:15 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-20 17:46:15 -0700 |
| commit | 7dbf6fe94c15f3e163dae48929ba1edbf0f06ba1 (patch) | |
| tree | 9976700cf9dbcf6f90f158430476abfc1243c9c6 /src | |
| parent | 8ea1c077f1ad903183192b09a2ded32dda04a8de (diff) | |
| parent | acfc72821c270acf151d394f3f1c1dbacd49afca (diff) | |
| download | jackson-databind-7dbf6fe94c15f3e163dae48929ba1edbf0f06ba1.tar.gz | |
Merge branch '2.10' into 2.11
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); } |