polish

2009-10-07 17:36:30 +00:00 · 2009-10-07 17:36:30 +00:00 · 3450c5de0b
parent ec04357580
commit 3450c5de0b
1 changed files with 2 additions and 1 deletions
--- 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<Object> context = getContext();
+		return context != null ? context.contains(source) : false;
 	}

 	/**