Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts findAnnotation to its previous state

Browse Source
This commit is contained in:
Lukasz Lenart
2018-01-29 09:04:03 +01:00
parent 46462b3d00
commit 72058bf4c6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
+6 -3
View File
@@ -140,13 +140,16 @@ public class AnnotationUtils {
*/
public static <T extends Annotation> T findAnnotation(Class<?> clazz, Class<T> annotationClass) {
T ann = clazz.getAnnotation(annotationClass);
if (ann == null && clazz != Object.class) {
while (ann == null && clazz != null) {
ann = clazz.getAnnotation(annotationClass);
if (ann == null) {
ann = clazz.getPackage().getAnnotation(annotationClass);
}
if (ann == null && clazz != Object.class) {
ann = findAnnotation(clazz.getSuperclass(), annotationClass);
if (ann == null) {
clazz = clazz.getSuperclass();
if (clazz != null) {
ann = clazz.getAnnotation(annotationClass);
}
}
}