29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From 706f47b898fcc614447ad8c97276df12f9a9f391 Mon Sep 17 00:00:00 2001
|
|
From: Tatu Saloranta <tatu.saloranta@iki.fi>
|
|
Date: Thu, 21 Jan 2021 15:32:20 +0800
|
|
Subject: [PATCH] Fixed #2997
|
|
|
|
---
|
|
.../jackson/databind/jsontype/impl/SubTypeValidator.java | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
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 94f2b95..2be6d49 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
|
|
@@ -220,6 +220,11 @@ public class SubTypeValidator
|
|
s.add("com.newrelic.agent.deps.ch.qos.logback.core.db.JNDIConnectionSource");
|
|
s.add("com.newrelic.agent.deps.ch.qos.logback.core.db.DriverManagerConnectionSource");
|
|
|
|
+ // [databind#2997]: tomcat/naming-factory-dbcp (embedded dbcp 1.x)
|
|
+ // (derivative of #2478)
|
|
+ s.add("org.apache.tomcat.dbcp.dbcp.datasources.PerUserPoolDataSource");
|
|
+ s.add("org.apache.tomcat.dbcp.dbcp.datasources.SharedPoolDataSource");
|
|
+
|
|
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
|
|
}
|
|
|
|
--
|
|
2.23.0
|
|
|