diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-20 17:48:10 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-20 17:48:10 -0700 |
| commit | 2c74ac6dc4203191cbd9ef45d26f476d154a8e42 (patch) | |
| tree | 5cc827d3d48dd684f2d4b84cbdc520831c61d2c5 /src | |
| parent | b3e5e6a5d771383d7ad2250cf54ac3c170f6d15d (diff) | |
| parent | 7dbf6fe94c15f3e163dae48929ba1edbf0f06ba1 (diff) | |
| download | jackson-databind-2c74ac6dc4203191cbd9ef45d26f476d154a8e42.tar.gz | |
Merge branch '2.11' into 2.12
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); } |