ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复CombinationAnnotationElement造成递归循环

Browse Source
This commit is contained in:
Looly 2022-07-17 18:19:13 +08:00
parent 5c6e7cf507
commit 10fd5d9f9b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hutool-core/src/main/java/cn/hutool/core/annotation/CombinationAnnotationElement.java
View File

@ -120,7 +120,7 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa
// 直接注解 // 直接注解
for (Annotation annotation : annotations) { for (Annotation annotation : annotations) {
annotationType = annotation.annotationType(); annotationType = annotation.annotationType();
// 跳过元注解和已经处理过的注解，防止递归调用 // issue#I5FQGW@Gitee：跳过元注解和已经处理过的注解，防止递归调用
if (AnnotationUtil.isNotJdkMateAnnotation(annotationType) if (AnnotationUtil.isNotJdkMateAnnotation(annotationType)
&& false == declaredAnnotationMap.containsKey(annotationType)) { && false == declaredAnnotationMap.containsKey(annotationType)) {
if(test(annotation)){ if(test(annotation)){
@ -141,6 +141,7 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa
Class<? extends Annotation> annotationType; Class<? extends Annotation> annotationType;
for (Annotation annotation : annotations) { for (Annotation annotation : annotations) {
annotationType = annotation.annotationType(); annotationType = annotation.annotationType();
// issue#I5FQGW@Gitee：跳过元注解和已经处理过的注解，防止递归调用
if (AnnotationUtil.isNotJdkMateAnnotation(annotationType) if (AnnotationUtil.isNotJdkMateAnnotation(annotationType)
&& false == declaredAnnotationMap.containsKey(annotationType)) { && false == declaredAnnotationMap.containsKey(annotationType)) {
if(test(annotation)){ if(test(annotation)){