zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2023-08-24 22:25:36 +08:00
parent b300e449a1
commit 1e322e6355
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java
View File

@@ -169,7 +169,7 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa
annotationType = annotation.annotationType(); annotationType = annotation.annotationType();
if (!META_ANNOTATIONS.contains(annotationType) if (!META_ANNOTATIONS.contains(annotationType)
// issue#I5FQGW@Gitee：跳过元注解和已经处理过的注解，防止递归调用 // issue#I5FQGW@Gitee：跳过元注解和已经处理过的注解，防止递归调用
&& !declaredAnnotationMap.containsKey(annotationType)) { && !annotationMap.containsKey(annotationType)) {
if(test(annotation)){ if(test(annotation)){
annotationMap.put(annotationType, annotation); annotationMap.put(annotationType, annotation);
} }

2
hutool-core/src/main/java/org/dromara/hutool/core/xml/XmlMapper.java
View File

@@ -116,7 +116,6 @@ public class XmlMapper {
} }
childEle = (Element) childNode; childEle = (Element) childNode;
final Object value = result.get(childEle.getNodeName());
final Object newValue; final Object newValue;
if (childEle.hasChildNodes()) { if (childEle.hasChildNodes()) {
// 子节点继续递归遍历 // 子节点继续递归遍历
@@ -131,6 +130,7 @@ public class XmlMapper {
} }
if (null != newValue) { if (null != newValue) {
final Object value = result.get(childEle.getNodeName());
if (null != value) { if (null != value) {
if (value instanceof List) { if (value instanceof List) {
((List<Object>) value).add(newValue); ((List<Object>) value).add(newValue);