diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-05-01 19:19:43 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-05-01 19:19:43 -0700 |
| commit | d9b8e7beb11f2a66ba3ed1745bff66e44905b06a (patch) | |
| tree | 303b53ce0d7b92c9dffaba5b6dbb690aa18a1a7c | |
| parent | dcb5efe9f27e40c491c8f6f65320964f829992d6 (diff) | |
| parent | 840eae2ca81c597a0010b2126f32dce17d384b70 (diff) | |
| download | jackson-databind-d9b8e7beb11f2a66ba3ed1745bff66e44905b06a.tar.gz | |
Merge branch '2.9' into 2.10
| -rw-r--r-- | release-notes/VERSION-2.x | 2 | ||||
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 3f6780978..dad0a1ccb 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -36,6 +36,8 @@ Project: jackson-databind (reported by Topsec(tcc)) #2698: Block one more gadget type (weblogic/oracle-aqjms) (reported by Fangrun Li) +#2704: Block one more gadget type (weblogic/oracle-aqjms) + (reported by XuYuanzhen) 2.9.10.4 (11-Apr-2020) 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 577ed4794..f27aaad73 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 @@ -113,8 +113,10 @@ public class SubTypeValidator s.add("org.apache.commons.configuration.JNDIConfiguration"); s.add("org.apache.commons.configuration2.JNDIConfiguration"); - // [databind#2469]: xalan2 + // [databind#2469]: xalan s.add("org.apache.xalan.lib.sql.JNDIConnectionPool"); + // [databind#2704]: xalan2 + s.add("com.sun.org.apache.xalan.internal.lib.sql.JNDIConnectionPool"); // [databind#2478]: comons-dbcp, p6spy s.add("org.apache.commons.dbcp.datasources.PerUserPoolDataSource"); |