1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
Description: Uses the renamed method MultiKeyMap.removeMultiKey() introduced
in libcommons-collections3-java 3.2.1-7 to solve a compatibility issue with
Java 8.
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/subprojects/json-lib-core/src/main/java/org/kordamp/json/JsonConfig.java
+++ b/subprojects/json-lib-core/src/main/java/org/kordamp/json/JsonConfig.java
@@ -1417,7 +1417,7 @@
*/
public void unregisterJsonValueProcessor(Class beanClass, Class propertyType) {
if (beanClass != null && propertyType != null) {
- beanTypeMap.remove(beanClass, propertyType);
+ beanTypeMap.removeMultiKey(beanClass, propertyType);
}
}
@@ -1430,7 +1430,7 @@
*/
public void unregisterJsonValueProcessor(Class beanClass, String key) {
if (beanClass != null && key != null) {
- beanKeyMap.remove(beanClass, key);
+ beanKeyMap.removeMultiKey(beanClass, key);
}
}
@@ -1490,4 +1490,4 @@
public void unregisterPropertyNameProcessor(Class target) {
unregisterJavaPropertyNameProcessor(target);
}
-}
\ No newline at end of file
+}
|
