aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-03-26 09:28:21 -0700
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-03-26 09:28:21 -0700
commitc14c9f99ed030dbd1440129585f03440c8758a99 (patch)
tree689fe5ba98f5c121068b5a3f9c8065e082c553ee /src/main/java/com
parent95787c3f7e8c8cb80c357182948ac240026535f4 (diff)
downloadjackson-databind-c14c9f99ed030dbd1440129585f03440c8758a99.tar.gz
Further additions wrt #2664
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java15
1 files changed, 12 insertions, 3 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 b2b6ee06e..bda078752 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
@@ -158,9 +158,18 @@ public class SubTypeValidator
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#2664]: activemq-core, activemq-pool, activemq-pool-jms
+
+ s.add("org.apache.activemq.ActiveMQConnectionFactory"); // core
+ s.add("org.apache.activemq.ActiveMQXAConnectionFactory");
+ s.add("org.apache.activemq.spring.ActiveMQConnectionFactory");
+ s.add("org.apache.activemq.spring.ActiveMQXAConnectionFactory");
+ s.add("org.apache.activemq.pool.JcaPooledConnectionFactory"); // pool
+ s.add("org.apache.activemq.pool.PooledConnectionFactory");
+ s.add("org.apache.activemq.pool.XaPooledConnectionFactory");
+ s.add("org.apache.activemq.jms.pool.XaPooledConnectionFactory"); // pool-jms
+ s.add("org.apache.activemq.jms.pool.JcaPooledConnectionFactory");
+
// [databind#2666]: apache/commons-jms
s.add("org.apache.commons.proxy.provider.remoting.RmiProvider");