39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
From c14c9f99ed030dbd1440129585f03440c8758a99 Mon Sep 17 00:00:00 2001
|
|
From: Tatu Saloranta <tatu.saloranta@iki.fi>
|
|
Date: Thu, 26 Mar 2020 09:28:21 -0700
|
|
Subject: [PATCH] Further additions wrt #2664
|
|
|
|
---
|
|
.../databind/jsontype/impl/SubTypeValidator.java | 15 ++++++++++++---
|
|
1 file 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");
|
|
|
|
--
|
|
2.23.0
|
|
|