From d4a505909747cc58eacb864b4742f0a558f9fbde Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 29 Dec 2014 13:17:49 +0100 Subject: [PATCH] AnnotationJmxAttributeSource uses AnnotationUtils for consistent meta-annotation handling and diagnostics Issue: SPR-12572 --- .../jmx/export/annotation/AnnotationJmxAttributeSource.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java index d1b02f758d..64c2a80811 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,7 +70,7 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource, BeanFac @Override public ManagedResource getManagedResource(Class beanClass) throws InvalidMetadataException { org.springframework.jmx.export.annotation.ManagedResource ann = - beanClass.getAnnotation(org.springframework.jmx.export.annotation.ManagedResource.class); + AnnotationUtils.getAnnotation(beanClass, org.springframework.jmx.export.annotation.ManagedResource.class); if (ann == null) { return null; } @@ -148,7 +148,7 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource, BeanFac @Override public ManagedNotification[] getManagedNotifications(Class clazz) throws InvalidMetadataException { - ManagedNotifications notificationsAnn = clazz.getAnnotation(ManagedNotifications.class); + ManagedNotifications notificationsAnn = AnnotationUtils.getAnnotation(clazz, ManagedNotifications.class); if (notificationsAnn == null) { return new ManagedNotification[0]; }