Commit 6571e82
authored
Fix the issue where MergedAnnotation is null when retrieved in Spring 5.x (#15581)
Added compatibility support for Spring 5.x in the method org.apache.dubbo.config.spring.util.AnnotationUtils#tryGetMergedAnnotation to ensure that MergedAnnotations can be correctly retrieved in Spring 5.x environments1 parent 9eeae4d commit 6571e82
1 file changed
Lines changed: 23 additions & 15 deletions
File tree
- dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util
Lines changed: 23 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
631 | 631 | | |
632 | 632 | | |
633 | 633 | | |
634 | | - | |
635 | | - | |
636 | | - | |
637 | | - | |
638 | | - | |
639 | | - | |
640 | | - | |
641 | | - | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
642 | 637 | | |
643 | | - | |
644 | | - | |
645 | | - | |
646 | | - | |
647 | | - | |
648 | | - | |
649 | | - | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
650 | 658 | | |
651 | 659 | | |
652 | 660 | | |
| |||
0 commit comments