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

Defensive resolution of getParameterType (actually never returning null) 

Includes defensive access to volatile field for resolved parameter type.

Issue: SPR-16072
This commit is contained in:
Juergen Hoeller 2017-10-16 19:59:07 +02:00
parent 03be8095ca
commit c2438cb932
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spring-core/src/main/java/org/springframework/core/MethodParameter.java
View File

@ -358,17 +358,20 @@ public class MethodParameter {
* @return the parameter type (never {@code null})
*/
public Class<?> getParameterType() {
if (this.parameterType == null) {
Class<?> paramType = this.parameterType;
if (paramType == null) {
if (this.parameterIndex < 0) {
this.parameterType = (this.method != null ? this.method.getReturnType() : null);
Method method = getMethod();
paramType = (method != null ? method.getReturnType() : void.class);
}
else {
this.parameterType = (this.method != null ?
this.method.getParameterTypes()[this.parameterIndex] :
this.constructor.getParameterTypes()[this.parameterIndex]);
paramType = (this.method != null ?
this.method.getParameterTypes()[this.parameterIndex] :
this.constructor.getParameterTypes()[this.parameterIndex]);
}
this.parameterType = paramType;
}
return this.parameterType;
return paramType;
}
/**
@ -377,17 +380,20 @@ public class MethodParameter {
* @since 3.0
*/
public Type getGenericParameterType() {
if (this.genericParameterType == null) {
Type paramType = this.genericParameterType;
if (paramType == null) {
if (this.parameterIndex < 0) {
this.genericParameterType = (this.method != null ? this.method.getGenericReturnType() : null);
Method method = getMethod();
paramType = (method != null ? method.getGenericReturnType() : void.class);
}
else {
this.genericParameterType = (this.method != null ?
this.method.getGenericParameterTypes()[this.parameterIndex] :
this.constructor.getGenericParameterTypes()[this.parameterIndex]);
paramType = (this.method != null ?
this.method.getGenericParameterTypes()[this.parameterIndex] :
this.constructor.getGenericParameterTypes()[this.parameterIndex]);
}
this.genericParameterType = paramType;
}
return this.genericParameterType;
return paramType;
}
/**