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

thread safety for caching

This commit is contained in:
Keith Donald 2010-04-19 19:22:35 +00:00
parent b25462ddf9
commit 6e13cc9eaa
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
View File

@ -78,6 +78,8 @@ public class TypeDescriptor {
private TypeDescriptor mapKeyType;
private TypeDescriptor mapValueType;
private Annotation[] annotations;
/**
* Create a new type descriptor from a method or constructor parameter.
@ -245,13 +247,11 @@ public class TypeDescriptor {
/**
* Return the element type as a type descriptor.
*/
public TypeDescriptor getElementTypeDescriptor() {
if (elementType != null) {
return elementType;
} else {
public synchronized TypeDescriptor getElementTypeDescriptor() {
if (elementType == null) {
elementType = forElementType(resolveElementType());
return elementType;
}
return elementType;
}
/**
@ -289,13 +289,11 @@ public class TypeDescriptor {
/**
* Returns map key type as a type descriptor.
*/
public TypeDescriptor getMapKeyTypeDescriptor() {
if (mapKeyType != null) {
return mapKeyType;
} else {
mapKeyType = isMap() ? forElementType(resolveMapKeyType()) : null;
return mapKeyType;
public synchronized TypeDescriptor getMapKeyTypeDescriptor() {
if (mapKeyType == null) {
mapKeyType = forElementType(resolveMapKeyType());
}
return mapKeyType;
}
/**
@ -319,13 +317,11 @@ public class TypeDescriptor {
/**
* Returns map value type as a type descriptor.
*/
public TypeDescriptor getMapValueTypeDescriptor() {
if (mapValueType != null) {
return mapValueType;
} else {
mapValueType = isMap() ? forElementType(resolveMapValueType()) : null;
return mapValueType;
public synchronized TypeDescriptor getMapValueTypeDescriptor() {
if (mapValueType == null) {
mapValueType = forElementType(resolveMapValueType());
}
return mapValueType;
}
/**
@ -341,23 +337,11 @@ public class TypeDescriptor {
/**
* Obtain the annotations associated with the wrapped parameter/field, if any.
*/
public Annotation[] getAnnotations() {
if (this.field != null) {
// not caching
return this.field.getAnnotations();
}
else if (this.methodParameter != null) {
if (this.methodParameter.getParameterIndex() < 0) {
// not caching
return this.methodParameter.getMethodAnnotations();
}
else {
return this.methodParameter.getParameterAnnotations();
}
}
else {
return EMPTY_ANNOTATION_ARRAY;
public synchronized Annotation[] getAnnotations() {
if (this.annotations == null) {
this.annotations = resolveAnnotations();
}
return this.annotations;
}
/**
@ -521,7 +505,7 @@ public class TypeDescriptor {
}
}
}
return type != null ? GenericCollectionTypeResolver.getMapKeyType((Class<? extends Map>) this.type) : null;
return type != null && isMap() ? GenericCollectionTypeResolver.getMapKeyType((Class<? extends Map>) this.type) : null;
}
@SuppressWarnings("unchecked")
@ -541,7 +525,24 @@ public class TypeDescriptor {
}
}
}
return type != null ? GenericCollectionTypeResolver.getMapValueType((Class<? extends Map>) this.type) : null;
return isMap() && type != null ? GenericCollectionTypeResolver.getMapValueType((Class<? extends Map>) this.type) : null;
}
private Annotation[] resolveAnnotations() {
if (this.field != null) {
return this.field.getAnnotations();
}
else if (this.methodParameter != null) {
if (this.methodParameter.getParameterIndex() < 0) {
return this.methodParameter.getMethodAnnotations();
}
else {
return this.methodParameter.getParameterAnnotations();
}
}
else {
return EMPTY_ANNOTATION_ARRAY;
}
}
/**