28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
|
From 82d5d10089d6ac311a41548502b7433016c46fc8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tatu Saloranta <tatu.saloranta@iki.fi>
|
||
|
|
Date: Wed, 11 Mar 2020 16:24:16 -0700
|
||
|
|
Subject: [PATCH] Fix #2653
|
||
|
|
|
||
|
|
---
|
||
|
|
.../jackson/databind/jsontype/impl/SubTypeValidator.java | 3 ++-
|
||
|
|
1 files changed, 2 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 9c0ff58d9..08f06ed41 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
|
||
|
|
@@ -138,8 +138,9 @@ public class SubTypeValidator
|
||
|
|
// [databind#2642]: javax.swing (jdk)
|
||
|
|
s.add("javax.swing.JEditorPane");
|
||
|
|
|
||
|
|
- // [databind#2648]: shire-core
|
||
|
|
+ // [databind#2648], [databind#2653]: shire-core
|
||
|
|
s.add("org.apache.shiro.realm.jndi.JndiRealmFactory");
|
||
|
|
+ s.add("org.apache.shiro.jndi.JndiObjectFactory");
|
||
|
|
|
||
|
|
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.23.0
|
||
|
|
|