root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

This commit is contained in:
Juergen Hoeller 2019-03-26 18:02:20 +01:00
parent 4ca27db0cc 699d75ec11
commit e3b6174b6d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
View File

@ -48,9 +48,9 @@ import org.springframework.util.StringUtils;
* <p>Note that most of the features of this class are not provided by the * <p>Note that most of the features of this class are not provided by the
* JDK's introspection facilities themselves. * JDK's introspection facilities themselves.
* *
* <p>As a general rule for runtime-retained annotations (e.g. for transaction * <p>As a general rule for runtime-retained application annotations (e.g. for
* control, authorization, or service exposure), always use the lookup methods * transaction control, authorization, or service exposure), always use the
* on this class (e.g., {@link #findAnnotation(Method, Class)} and * lookup methods on this class (e.g. {@link #findAnnotation(Method, Class)} or
* {@link #getAnnotation(Method, Class)}) instead of the plain annotation lookup * {@link #getAnnotation(Method, Class)}) instead of the plain annotation lookup
* methods in the JDK. You can still explicitly choose between a <em>get</em> * methods in the JDK. You can still explicitly choose between a <em>get</em>
* lookup on the given class level only ({@link #getAnnotation(Method, Class)}) * lookup on the given class level only ({@link #getAnnotation(Method, Class)})
@ -1055,8 +1055,7 @@ public abstract class AnnotationUtils {
} }
catch (InvocationTargetException ex) { catch (InvocationTargetException ex) {
rethrowAnnotationConfigurationException(ex.getTargetException()); rethrowAnnotationConfigurationException(ex.getTargetException());
throw new IllegalStateException( throw new IllegalStateException("Could not obtain value for annotation attribute '" +
"Could not obtain value for annotation attribute '" +
attributeName + "' in " + annotation, ex); attributeName + "' in " + annotation, ex);
} }
catch (Throwable ex) { catch (Throwable ex) {