Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MethodParameter generally uses volatile variables where applicable now (as well as a local copy of the parameterNameDiscoverer field)

Browse Source 
Issue: SPR-12453
(cherry picked from commit 7fcadaa)
This commit is contained in:
Juergen Hoeller
2014-11-22 16:45:26 +01:00
parent cf5077861a
commit d02d9cea4e
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,15 +48,15 @@ public class MethodParameter {
private final int parameterIndex;
private Class<?> parameterType;
private volatile Class<?> parameterType;
private Type genericParameterType;
private volatile Type genericParameterType;
private Annotation[] parameterAnnotations;
private volatile Annotation[] parameterAnnotations;
private ParameterNameDiscoverer parameterNameDiscoverer;
private volatile ParameterNameDiscoverer parameterNameDiscoverer;
private String parameterName;
private volatile String parameterName;
private int nestingLevel = 1;
@@ -335,10 +335,10 @@ public class MethodParameter {
* has been set to begin with)
*/
public String getParameterName() {
if (this.parameterNameDiscoverer != null) {
ParameterNameDiscoverer discoverer = this.parameterNameDiscoverer;
if (discoverer != null) {
String[] parameterNames = (this.method != null ?
this.parameterNameDiscoverer.getParameterNames(this.method) :
this.parameterNameDiscoverer.getParameterNames(this.constructor));
discoverer.getParameterNames(this.method) : discoverer.getParameterNames(this.constructor));
if (parameterNames != null) {
this.parameterName = parameterNames[this.parameterIndex];
}
@@ -414,15 +414,15 @@ public class MethodParameter {
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
public boolean equals(Object other) {
if (this == other) {
return true;
}
if (obj != null && obj instanceof MethodParameter) {
MethodParameter other = (MethodParameter) obj;
return (this.parameterIndex == other.parameterIndex && getMember().equals(other.getMember()));
if (!(other instanceof MethodParameter)) {
return false;
}
return false;
MethodParameter otherParam = (MethodParameter) other;
return (this.parameterIndex == otherParam.parameterIndex && getMember().equals(otherParam.getMember()));
}
@Override