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

renamed to MappingContext since no spel dep 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2064 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Keith Donald 2009-10-07 16:56:13 +00:00
parent 5415ff882f
commit a4bbec9726
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.context/src/main/java/org/springframework/mapping/support/MapperConverter.java
View File

@ -46,7 +46,7 @@ public class MapperConverter implements GenericConverter {
if (source == null) {
return null;
}
if (SpelMappingContextHolder.contains(source)) {
if (MappingContextHolder.contains(source)) {
return source;
}
if (sourceType.isAssignableTo(targetType) && isCopyByReference(sourceType, targetType)) {

2
org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMappingContextHolder.java → org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java
View File

@ -4,7 +4,7 @@ import java.util.Stack;
import org.springframework.core.NamedThreadLocal;
class SpelMappingContextHolder {
class MappingContextHolder {
private static final ThreadLocal<Stack<Object>> mappingContextHolder = new NamedThreadLocal<Stack<Object>>(
"Mapping context");

6
org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMapper.java
View File

@ -97,7 +97,7 @@ public class SpelMapper implements Mapper<Object, Object> {
public Object map(Object source, Object target) {
try {
SpelMappingContextHolder.push(source);
MappingContextHolder.push(source);
EvaluationContext sourceContext = getEvaluationContext(source);
EvaluationContext targetContext = getEvaluationContext(target);
List<MappingFailure> failures = new LinkedList<MappingFailure>();
@ -113,7 +113,7 @@ public class SpelMapper implements Mapper<Object, Object> {
}
return target;
} finally {
SpelMappingContextHolder.pop();
MappingContextHolder.pop();
}
}
@ -124,7 +124,7 @@ public class SpelMapper implements Mapper<Object, Object> {
private void doMap(SpelMapping mapping, EvaluationContext sourceContext, EvaluationContext targetContext,
List<MappingFailure> failures) {
if (logger.isDebugEnabled()) {
logger.debug(SpelMappingContextHolder.getLevel() + mapping);
logger.debug(MappingContextHolder.getLevel() + mapping);
}
mapping.map(sourceContext, targetContext, failures);
}