diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-03-25 13:19:33 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-03-25 13:19:33 -0700 |
| commit | 458541d9284f98b30063d396f925f6fd3b2fa226 (patch) | |
| tree | a40c42d569fb7d87a3f476318b8092a7303f645a /src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java | |
| parent | c1a2d7fdeb6de81f1627db46df32f450d7c7d88c (diff) | |
| parent | 05d7e0e13f43e12db6a51726df12c8b4d8040676 (diff) | |
| download | jackson-databind-458541d9284f98b30063d396f925f6fd3b2fa226.tar.gz | |
Merge branch '2.9' into 2.10
Diffstat (limited to 'src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java | 12 |
1 files changed, 11 insertions, 1 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 1de659c33..f41e60ad4 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 @@ -153,7 +153,17 @@ public class SubTypeValidator // [databind#2660]: caucho-quercus s.add("com.caucho.config.types.ResourceRef"); - + + // [databind#2662]: aoju/bus-proxy + s.add("org.aoju.bus.proxy.provider.RmiProvider"); + s.add("org.aoju.bus.proxy.provider.remoting.RmiProvider"); + + // [databind#2664]: activemq-jms + s.add("org.apache.activemq.jms.pool.XaPooledConnectionFactory"); + + // [databind#2666]: apache/commons-jms + s.add("org.apache.commons.proxy.provider.remoting.RmiProvider"); + DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s); } |