Skip to content

Commit 1a79c6a

Browse files
committed
Merge branch '2.9' into 2.10
2 parents c671a1d + 33d96c1 commit 1a79c6a

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,11 @@ public class SubTypeValidator
211211
s.add("org.apache.commons.dbcp2.datasources.PerUserPoolDataSource");
212212
s.add("org.apache.commons.dbcp2.datasources.SharedPoolDataSource");
213213

214+
// [databind#2996]: newrelic-agent + embedded-logback-core
215+
// (derivative of #2334 and #2389)
216+
s.add("com.newrelic.agent.deps.ch.qos.logback.core.db.JNDIConnectionSource");
217+
s.add("com.newrelic.agent.deps.ch.qos.logback.core.db.DriverManagerConnectionSource");
218+
214219
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
215220
}
216221

0 commit comments

Comments
 (0)