diff --git a/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java b/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java index fbb3bc407da..dfa03cc4843 100644 --- a/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java +++ b/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java @@ -45,7 +45,8 @@ class MappingContextHolder { * Is the source being mapped or has already been mapped? */ public static boolean contains(Object source) { - return getContext().contains(source); + Stack context = getContext(); + return context != null ? context.contains(source) : false; } /**