Merge branch '2.10' into 2.11

cowtowncoder · cowtowncoder · commit 7dbf6fe94c15 · 2020-07-20T17:46:15.000-07:00
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
@@ -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);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,9 @@ public class SubTypeValidator`
`197`	`197`	`// [databind#2764]: org.jsecurity:`
`198`	`198`	`s.add("org.jsecurity.realm.jndi.JndiRealmFactory");`
`199`	`199`
	`200`	`+ // [databind#2798]: com.pastdev.httpcomponents:`
	`201`	`+ s.add("com.pastdev.httpcomponents.configuration.JndiConfiguration");`
	`202`	`+`
`200`	`203`	`DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);`
`201`	`204`	`}`
`202`	`205`